diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp
index 85d5106a2..842020a8c 100644
--- a/radio/src/stamp.cpp
+++ b/radio/src/stamp.cpp
@@ -32,15 +32,23 @@
 #define TAB "\037\033"
 #endif
 
+#if defined(FRSKY_RELEASE)
+#define DISPLAY_VERSION "FrSky"
+#elif defined(JUMPER_RELEASE)
+#define DISPLAY_VERSION "JumperRC"
+#else
+#define DISPLAY_VERSION VERSION
+#endif
+
 #if defined(COLORLCD)
-  const char vers_stamp[]  =   "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
+  const char vers_stamp[]  =   "VERS" TAB ": " "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")";
   const char date_stamp[]  =   "DATE" TAB ": " DATE;
   const char time_stamp[]  =   "TIME" TAB ": " TIME;
   const char eeprom_stamp[]  = "EEPR" TAB ": " EEPROM_STR;
 #elif defined(BOARD_NAME)
-  const char vers_stamp[]  = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
+  const char vers_stamp[]  = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
 #else
-  const char vers_stamp[]  = "FW" TAB ": opentx-" FLAVOUR    "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
+  const char vers_stamp[]  = "FW" TAB ": opentx-" FLAVOUR    "\036VERS" TAB ": " DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
 #endif
 
 /**
@@ -49,8 +57,8 @@
  */
 #if defined(STM32) && !defined(SIMU)
 
-__SECTION_USED(".fwversiondata")   const char firmware_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
-__SECTION_USED(".bootversiondata") const char boot_version[] =     "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
+__SECTION_USED(".fwversiondata")   const char firmware_version[] = "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")";
+__SECTION_USED(".bootversiondata") const char boot_version[] =     "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")";
 
 /**
  * Tries to find opentx version in the first 1024 byte of either firmware/bootloader (the one not running) or the buffer
diff --git a/radio/src/stamp.h.in b/radio/src/stamp.h.in
index a8dd9884e..f360b3a90 100644
--- a/radio/src/stamp.h.in
+++ b/radio/src/stamp.h.in
@@ -1,12 +1,6 @@
 #define DATE    "@DATE@"
 #define TIME    "@TIME@"
-#if defined(FRSKY_RELEASE)
-#define VERSION "FrSky"
-#elif defined(JUMPER_RELEASE)
-#define VERSION "JumperRC"
-#else
 #define VERSION "@VERSION@"
-#endif
 
 #define VERSION_MAJOR     @VERSION_MAJOR@
 #define VERSION_MINOR     @VERSION_MINOR@