diff --git a/Firmware/base.h b/Firmware/base.h
index 74156095..01d68148 100644
--- a/Firmware/base.h
+++ b/Firmware/base.h
@@ -44,7 +44,9 @@
 /**
  * @brief Firmware version string, used at startup and for the 'i' command.
  */
-#define BP_FIRMWARE_STRING "Community Firmware v7.1 - goo.gl/gCzQnW "
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+#define BP_FIRMWARE_STRING "Community Firmware v7.1 - goo.gl/gCzQnW - " STRINGIFY(VERSION) " \r\n"
 
 /**
  * @brief Current mode configuration settings structure.
diff --git a/Firmware/busPirate.X/Makefile b/Firmware/busPirate.X/Makefile
index 5edcb792..9c671d0e 100644
--- a/Firmware/busPirate.X/Makefile
+++ b/Firmware/busPirate.X/Makefile
@@ -85,6 +85,7 @@ all: .all-post
 
 .all-pre:
 # Add your pre 'all' code here...
+VERSION:=${shell git rev-parse --short HEAD}
 
 .all-post: .all-impl
 # Add your post 'all' code here...
diff --git a/Firmware/busPirate.X/nbproject/configurations.xml b/Firmware/busPirate.X/nbproject/configurations.xml
index 159bb302..b063c694 100644
--- a/Firmware/busPirate.X/nbproject/configurations.xml
+++ b/Firmware/busPirate.X/nbproject/configurations.xml
@@ -314,7 +314,7 @@
         <property key="scalar-model" value="default"/>
         <property key="use-cci" value="true"/>
         <property key="use-iar" value="false"/>
-        <appendMe value="-save-temps -finline"/>
+        <appendMe value="-save-temps -finline -DVERSION=\&quot;$(VERSION)\&quot;"/>
       </C30>
       <C30-AR>
         <property key="additional-options-chop-files" value="false"/>