diff --git a/common.mk b/common.mk
index 47d5c852f3..64ef86c404 100644
--- a/common.mk
+++ b/common.mk
@@ -69,5 +69,9 @@ ifdef BACKLIGHT_ENABLE
 endif
 
 
+# Version string
+OPT_DEFS += -DVERSION=$(shell (git describe --dirty || echo 'unknown') 2> /dev/null)
+
+
 # Search Path
 VPATH += $(TOP_DIR)/common
diff --git a/common/command.c b/common/command.c
index 4649e00ab0..7415645b0d 100644
--- a/common/command.c
+++ b/common/command.c
@@ -252,9 +252,10 @@ static bool command_common(uint8_t code)
         case KC_V: // print version & information
             print("\n\n----- Version -----\n");
             print(STR(DESCRIPTION) "\n");
-            print(STR(MANUFACTURER) "(" STR(VENDOR_ID) ")/");
-            print(STR(PRODUCT) "(" STR(PRODUCT_ID) ") ");
-            print("VERSION: " STR(DEVICE_VER) "\n");
+            print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") VER: " STR(DEVICE_VER) "\n");
+            print("SRC: " STR(VERSION) "\n");
+            print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__) "\n");
+            print("AVR-LIBC: " __AVR_LIBC_VERSION_STRING__ "\n");
             break;
         case KC_T: // print timer
             print_val_hex32(timer_count);