diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 440131637..e0fdb94d8 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -1,17 +1,12 @@
 PROJECT( companion )
 
-SET( C9X_VERSION_MAJOR "2" )
-SET( C9X_VERSION_MINOR "1" )
-SET( C9X_VERSION_REVISION "1" )
-if(DEFINED C9X_VERSION_SUFFIX)
-  set(ENV{OPENTX_VERSION_SUFFIX} ${C9X_VERSION_SUFFIX})
-else()
-  set(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
-endif()
+SET(C9X_VERSION_MAJOR "2")
+SET(C9X_VERSION_MINOR "1")
+SET(C9X_VERSION_REVISION "1")
+SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 
-message(STATUS ${C9X_VERSION_SUFFIX} $ENV{OPENTX_VERSION_SUFFIX})
-
-SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX} )
+SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
+MESSAGE(STATUS OpenTX Companion ${C9X_VERSION})
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 
diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
index 5ecafc8b9..c1c96a516 100644
--- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt
+++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
@@ -14,7 +14,7 @@ add_custom_target(about_lbm_taranis
 )
 
 add_custom_target(commondeps
-  OPENTX_VERSION_SUFFIX=${C9X_VERSION_SUFFIX} && make stamp_header tra
+  make stamp_header tra
   WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )
 
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 49650c361..13378ec29 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -1020,7 +1020,7 @@ QPixmap makePixMap( QImage image, QString firmwareType )
 int version2index(const QString & version)
 {
   int result = 999;
-  QStringList parts = version.split(":n");
+  QStringList parts = version.split("N");
   if (parts.size() > 1)
     result = parts[1].toInt(); // nightly build
   parts = parts[0].split('.');
@@ -1044,7 +1044,7 @@ QString index2version(int index)
     int major = index / 100;
     QString result = QString("%1.%2.%3").arg(major).arg(minor).arg(revision);
     if (nightly > 0 && nightly < 999) {
-      result += QString(":n%1").arg(nightly);
+      result += QString("N%1").arg(nightly);
     }
     return result;
   }