diff --git a/CMake/getsvn.cmake b/CMake/getsvn.cmake
index bf7e73f73..754963639 100644
--- a/CMake/getsvn.cmake
+++ b/CMake/getsvn.cmake
@@ -45,7 +45,7 @@ else (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
     # write a file with the SVNVERSION define
     file (WRITE "${OUTPUT_DIR}/svnversion.h.txt" "#define SVNVERSION r${MY_WC_LAST_CHANGED_REV}\n")
   else (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
-    file (WRITE "${OUTPUT_DIR}/svnversion.h.txt" "#define SVNVERSION local\n")
+    file (WRITE "${OUTPUT_DIR}/svnversion.h.txt" "#define SVNVERSION\n")
   endif (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.git")
 endif (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
 
diff --git a/main.cpp b/main.cpp
index 19fa83665..130a7bfaf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -47,14 +47,7 @@ int main(int argc, char *argv[])
 	      
       // Override programs executable basename as application name.
       a.setApplicationName ("WSJT-X");
-#if CMAKE_BUILD
-      QString version {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR)
-        "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR)
-          "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH) " " + revision ()};
-#else
-      QString version {"1.4.0"};
-#endif
-      a.setApplicationVersion (version.trimmed ());
+      a.setApplicationVersion (version ());
 
       bool multiple {false};
 
diff --git a/revision_utils.cpp b/revision_utils.cpp
index 11454ab94..49a2d5356 100644
--- a/revision_utils.cpp
+++ b/revision_utils.cpp
@@ -63,17 +63,26 @@ QString revision (QString const& svn_rev_string)
   return result.trimmed ();
 }
 
-QString program_title (QString const& revision)
+QString version ()
 {
 #if defined (CMAKE_BUILD)
-  QString id {QCoreApplication::applicationName () + "   v" WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH)};
-
+  QString v {WSJTX_STRINGIZE (WSJTX_VERSION_MAJOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_MINOR) "." WSJTX_STRINGIZE (WSJTX_VERSION_PATCH)};
 # if defined (WSJTX_RC)
-  id += "-rc" WSJTX_STRINGIZE (WSJTX_RC);
+  v += "-rc" WSJTX_STRINGIZE (WSJTX_RC);
 # endif
-
 #else
-  QString id {"WSJT-X   v1.4";
+  QString v {"1.4.0"};
+#endif
+  return v;
+}
+
+QString program_title (QString const& revision)
+{
+  QString id {QCoreApplication::applicationName ()};
+#if defined (CMAKE_BUILD)
+  id += "   v" + version ();
+#else
+  id += "   v1.4";
 #endif
   return id + " " + revision + "  by K1JT";
 }
diff --git a/revision_utils.hpp b/revision_utils.hpp
index 8da0c9586..838c36e25 100644
--- a/revision_utils.hpp
+++ b/revision_utils.hpp
@@ -4,6 +4,7 @@
 #include <QString>
 
 QString revision (QString const& svn_rev_string = QString {});
+QString version ();
 QString program_title (QString const& revision = QString {});
 
 #endif