diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index f278cbd5b..47b8fb04a 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -35,6 +35,8 @@
 #define AUDIO
 #define VOICE
 #define PXX
+#define DSM2
+#define DSM2_PPM
 #define DBLKEYS
 #define AUTOSWITCH
 #define GRAPHICS
@@ -47,6 +49,7 @@
 #define PPM_CENTER_ADJUSTABLE
 #define PPM_LIMITS_SYMETRICAL
 #define FAI_CHOICE
+
 #define EEPROM_VARIANT 3
 
 #undef min
@@ -65,6 +68,7 @@ inline int geteepromsize() {
 #include "radio/src/targets/taranis/board_taranis.cpp"
 #include "radio/src/protocols/ppm_arm.cpp"
 #include "radio/src/protocols/pxx_arm.cpp"
+#include "radio/src/protocols/dsm2_arm.cpp"
 #include "radio/src/targets/taranis/pwr_driver.cpp"
 #include "radio/src/eeprom_common.cpp"
 #include "radio/src/eeprom_conversions.cpp"
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index e44aad71e..0bd5d7528 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -1974,8 +1974,10 @@ void Open9xModelDataNew::beforeExport()
   for (int module=0; module<3; module++) {
     if (modelData.moduleData[module].protocol >= PXX_XJT_X16 && modelData.moduleData[module].protocol <= PXX_XJT_LR12)
       subprotocols[module] = modelData.moduleData[module].protocol - PXX_XJT_X16;
+    else if (modelData.moduleData[module].protocol >= LP45 && modelData.moduleData[module].protocol <= DSMX)
+      subprotocols[module] = modelData.moduleData[module].protocol - LP45;
     else
-      subprotocols[module] = (module==0 ? -1:0);
+      subprotocols[module] = (module==0 ? -1 : 0);
   }
 }
 
@@ -1984,9 +1986,9 @@ void Open9xModelDataNew::afterImport()
   // qDebug() << QString("after import model") << modelData.name ;
 
   for (int module=0; module<3; module++) {
-    if (modelData.moduleData[module].protocol == PXX_XJT_X16) {
-      if (subprotocols[module]>=0)
-        modelData.moduleData[module].protocol = PXX_XJT_X16 + subprotocols[module];
+    if (modelData.moduleData[module].protocol == PXX_XJT_X16 || modelData.moduleData[module].protocol == LP45) {
+      if (subprotocols[module] >= 0)
+        modelData.moduleData[module].protocol += subprotocols[module];
       else
         modelData.moduleData[module].protocol = OFF;
     }
diff --git a/companion/src/firmwares/opentx/opentxeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h
index 363c46677..67d051663 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.h
+++ b/companion/src/firmwares/opentx/opentxeeprom.h
@@ -74,8 +74,9 @@ class ProtocolsConversionTable: public ConversionTable
     ProtocolsConversionTable(BoardEnum board)
     {
       int val = 0;
-      if (IS_TARANIS(board))
+      if (IS_TARANIS(board)) {
         addConversion(OFF, val++);
+      }
       addConversion(PPM, val++);
       if (!IS_ARM(board)) {
         addConversion(PPM16, val++);
@@ -86,9 +87,13 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PXX_XJT_D8, val);
         addConversion(PXX_XJT_LR12, val++);
       }
-      addConversion(PXX_DJT, val++);
+      else {
+        addConversion(PXX_DJT, val++);
+      }
       if (IS_TARANIS(board)) {
-        addConversion(DSM2, val++);
+        addConversion(LP45, val);
+        addConversion(DSM2, val);
+        addConversion(DSMX, val++);
       }
       else {
         addConversion(LP45, val++);
@@ -126,7 +131,7 @@ class Open9xModelDataNew: public TransformedField {
 
   private:
     char name[256];
-    signed int subprotocols[C9X_NUM_MODULES+1/*trainer*/];
+    int subprotocols[C9X_NUM_MODULES+1/*trainer*/];
     ProtocolsConversionTable protocolsConversionTable;
     ChannelsConversionTable channelsConversionTable;
 };
diff --git a/companion/src/firmwares/opentx/stamp-opentx.h.in b/companion/src/firmwares/opentx/stamp-opentx.h.in
index 246c69b5d..1b56589f5 100644
--- a/companion/src/firmwares/opentx/stamp-opentx.h.in
+++ b/companion/src/firmwares/opentx/stamp-opentx.h.in
@@ -1,6 +1,5 @@
 // Automatically generated file (CMake) - do not edit
 #define DATE_STR  "@DATE@"
 #define TIME_STR  "@TIME@"
-#define VERS_STR  "c9x"
-#define VERS_STR  "@FIRMWARE@-r@G9X_WC_REVISION@"
+#define VERS_STR  "@C9X_VERSION@"
 #define MOD_STR   "FH"