diff --git a/elf2cfetbl.c b/elf2cfetbl.c
index e5bf21c..3705529 100644
--- a/elf2cfetbl.c
+++ b/elf2cfetbl.c
@@ -1282,7 +1282,12 @@ int32 ProcessCmdLineOptions(int ArgumentCount, char *Arguments[])
 void OutputVersionInfo(void)
 {
     printf("\nElf Object File to cFE Table Image File Conversion Tool\n");
-    printf("Version v%d.%d.%d.%d ", ELF2CFETBL_MAJOR_VERSION, ELF2CFETBL_MINOR_VERSION, ELF2CFETBL_REVISION, ELF2CFETBL_MISSION_REV);
+    
+    /* Use this line for release versions
+    * printf("Version v%d.%d.%d.%d ", ELF2CFETBL_MAJOR_VERSION, ELF2CFETBL_MINOR_VERSION, ELF2CFETBL_REVISION, ELF2CFETBL_MISSION_REV); 
+    */
+    
+    printf("DEVELOPMENT VERSION: %s-%d (v%s+dev%d))\n", ELF2CFETBL_CODENAME, ELF2CFETBL_BUILDNUMBER, ELF2CFETBL_BASELINE, ELF2CFETBL_BUILDNUMBER);
     printf(" Built - %s %s\n\n", __DATE__, __TIME__);
 }
 
diff --git a/elf2cfetbl_version.h b/elf2cfetbl_version.h
index 8ce512c..f5c66b3 100644
--- a/elf2cfetbl_version.h
+++ b/elf2cfetbl_version.h
@@ -30,7 +30,14 @@
 #define ELF2CFETBL_VERSION_H
 
 /*
- * Macro Definitions
+ * Development build identifiers
+ */
+#define ELF2CFETBL_CODENAME "Bootes"
+#define ELF2CFETBL_BASELINE "v3.1.0"
+#define ELF2CFETBL_BUILDNUMBER 34
+
+/*
+ * Version Macro Definitions
  */
 #define ELF2CFETBL_MAJOR_VERSION 3
 #define ELF2CFETBL_MINOR_VERSION 1