diff --git a/src/main/io/display.c b/src/main/io/display.c
index 3da8750050..849560f8de 100644
--- a/src/main/io/display.c
+++ b/src/main/io/display.c
@@ -240,12 +240,14 @@ void showRxPage(void)
 
 void showWelcomePage(void)
 {
-    tfp_sprintf(lineBuffer, "Rev: %s", shortGitRevision);
-    i2c_OLED_set_line(PAGE_TITLE_LINE_COUNT + 0);
+    uint8_t rowIndex = PAGE_TITLE_LINE_COUNT;
+
+    tfp_sprintf(lineBuffer, "v%s (%s)", FC_VERSION_STRING, shortGitRevision);
+    i2c_OLED_set_line(rowIndex++);
     i2c_OLED_send_string(lineBuffer);
 
     tfp_sprintf(lineBuffer, "Target: %s", targetName);
-    i2c_OLED_set_line(PAGE_TITLE_LINE_COUNT + 1);
+    i2c_OLED_set_line(rowIndex++);
     i2c_OLED_send_string(lineBuffer);
 }
 
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 22911ca289..276c9310a1 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -1393,11 +1393,9 @@ static void cliVersion(char *cmdline)
 {
     UNUSED(cmdline);
 
-    printf("Cleanflight/%s %d.%d.%d %s / %s (%s)",
+    printf("Cleanflight/%s %s %s / %s (%s)",
         targetName,
-        FC_VERSION_MAJOR,
-        FC_VERSION_MINOR,
-        FC_VERSION_PATCH_LEVEL,
+        FC_VERSION_STRING,
         buildDate,
         buildTime,
         shortGitRevision
diff --git a/src/main/version.h b/src/main/version.h
index cb3706b0c3..0c8c645aed 100644
--- a/src/main/version.h
+++ b/src/main/version.h
@@ -19,6 +19,10 @@
 #define FC_VERSION_MINOR            7  // increment when a minor release is made (small new feature, change etc)
 #define FC_VERSION_PATCH_LEVEL      0  // increment when a bug is fixed
 
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)
+
 #define MW_VERSION              231
 
 extern char* targetName;