diff --git a/main.c b/main.c
index 0fbbf3e..1616885 100644
--- a/main.c
+++ b/main.c
@@ -35,6 +35,7 @@
 #include <String.h>
 
 #include "defines.h"
+#include "version.h"
 #include "config.h"
 #include "uart.h"
 #include "spi.h"
@@ -43,10 +44,6 @@
 #include "clock.h"
 #include "mos.h"
 
-#define		MOS_version		1
-#define		MOS_revision 	4
-#define		MOS_rc			2
-
 extern void *	set_vector(unsigned int vector, void(*handler)(void));
 
 extern void 	vblank_handler(void);
@@ -121,9 +118,13 @@ int main(void) {
 	if(coldBoot == 0) {								// If a warm boot detected then
 		putch(12);									// Clear the screen
 	}
-	printf("Agon Quark MOS Version %d.%02d", MOS_version, MOS_revision);
-	#if MOS_rc > 0
-		printf(" RC%d", MOS_rc);
+	printf("Agon %s MOS Version %d.%d.%d", VERSION_VARIANT, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+	#if VERSION_CANDIDATE > 0
+		printf(" %s%d", VERSION_TYPE, VERSION_CANDIDATE);
+	#endif
+	// Show build if defined (intended to be auto-generated string from build script from git commit hash)
+	#ifdef VERSION_BUILD
+		printf(" Build %s", VERSION_BUILD);
 	#endif
 	printf("\n\r\n\r");
 	#if	DEBUG > 0
diff --git a/src/version.h b/src/version.h
new file mode 100644
index 0000000..39c877e
--- /dev/null
+++ b/src/version.h
@@ -0,0 +1,12 @@
+#ifndef VERSION_H
+#define VERSION_H
+
+#define		VERSION_MAJOR		2
+#define		VERSION_MINOR		0
+#define		VERSION_PATCH		0
+#define		VERSION_CANDIDATE	1			// Optional
+#define		VERSION_TYPE		"Alpha "	// RC, Alpha, Beta, etc.
+
+#define		VERSION_VARIANT		"Quark"
+
+#endif // VERSION_H