diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 094c3eafe..a93713138 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -779,11 +779,12 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
-          case PULSES_CROSSFIRE:
           case PULSES_SBUS:
             return 1;
           case PULSES_MULTIMODULE:
             return id.contains("multimodule") ? 1 : 0;
+          case PULSES_CROSSFIRE:
+            return id.contains("crossfire") ? 1 : 0;
           case PULSES_ACCESS_R9M_LITE:
           case PULSES_ACCESS_R9M_LITE_PRO:
             return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board)) ? 1 : 0;
@@ -1144,6 +1145,7 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware)
   firmware->addOption("nogvars", Firmware::tr("Disable Global variables"));
   firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
   firmware->addOption("luac", Firmware::tr("Enable Lua compiler"));
+  firmware->addOption("crossfire", Firmware::tr("Support for Crossfire TX Module"));
   addOpenTxRfOptions(firmware);
 }
 
diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py
index 997946f99..a715d0cc5 100755
--- a/radio/util/fwoptions.py
+++ b/radio/util/fwoptions.py
@@ -81,6 +81,7 @@ options_taranis_x9d = {
     "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_taranis_x9dp = {
@@ -98,6 +99,7 @@ options_taranis_x9dp = {
     "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_taranis_x9lite = {
@@ -115,6 +117,7 @@ options_taranis_x9lite = {
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
     "internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_taranis_xlite = {
@@ -129,7 +132,8 @@ options_taranis_xlite = {
     "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
     "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
-    "multimodule": ("MULTIMODULE", "YES", "NO")
+    "multimodule": ("MULTIMODULE", "YES", "NO"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_taranis_xlites = {
@@ -146,6 +150,7 @@ options_taranis_xlites = {
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
     "internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_taranis_x9e = {
@@ -163,6 +168,7 @@ options_taranis_x9e = {
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "horussticks": ("STICKS", "HORUS", "STANDARD"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_horus_x12s = {
@@ -177,6 +183,7 @@ options_horus_x12s = {
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
     "pcbdev": ("PCBREV", "10", None),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }
 
 options_horus_x10 = {
@@ -190,4 +197,5 @@ options_horus_x10 = {
     "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
     "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
     "multimodule": ("MULTIMODULE", "YES", "NO"),
+    "crossfire": ("CROSSFIRE", "YES", "NO")
 }