diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index da6f37e72..6ee389b89 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -39,7 +39,7 @@ AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
   setWindowIcon(CompanionIcon("apppreferences.png"));
 
   initSettings();
-  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(onBaseFirmwareChanged()));
+  connect(ui->boardCB, SIGNAL(currentIndexChanged(int)), this, SLOT(onBaseFirmwareChanged()));
   connect(ui->opt_appDebugLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
   connect(ui->opt_fwTraceLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
 
@@ -282,9 +282,9 @@ void AppPreferencesDialog::initSettings()
 
   QString currType = QStringList(profile.fwType().split('-').mid(0, 2)).join('-');
   foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
-    ui->downloadVerCB->addItem(firmware->getName(), firmware->getId());
+    ui->boardCB->addItem(firmware->getName(), firmware->getId());
     if (currType == firmware->getId()) {
-      ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
+      ui->boardCB->setCurrentIndex(ui->boardCB->count() - 1);
     }
   }
 
@@ -442,12 +442,12 @@ void AppPreferencesDialog::onBaseFirmwareChanged()
 
 Firmware *AppPreferencesDialog::getBaseFirmware() const
 {
-  return Firmware::getFirmwareForId(ui->downloadVerCB->currentData().toString());
+  return Firmware::getFirmwareForId(ui->boardCB->currentData().toString());
 }
 
 Firmware * AppPreferencesDialog::getFirmwareVariant() const
 {
-  QString id = ui->downloadVerCB->currentData().toString();
+  QString id = ui->boardCB->currentData().toString();
 
   foreach(QCheckBox *cb, optionsCheckBoxes.values()) {
     if (cb->isChecked())
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index 4ecc2f71f..c72a15fa7 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -349,7 +349,7 @@
         </widget>
        </item>
        <item row="2" column="1">
-        <widget class="QComboBox" name="downloadVerCB">
+        <widget class="QComboBox" name="boardCB">
          <property name="enabled">
           <bool>true</bool>
          </property>
@@ -1425,7 +1425,7 @@ Mode 4:
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>profileNameLE</tabstop>
-  <tabstop>downloadVerCB</tabstop>
+  <tabstop>boardCB</tabstop>
   <tabstop>sdPath</tabstop>
   <tabstop>sdPathButton</tabstop>
   <tabstop>profilebackupPath</tabstop>
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index cfe49fce4..c66c31a7d 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1172,6 +1172,11 @@ void registerOpenTxFirmwares()
   addOpenTxTaranisOptions(firmware);
   registerOpenTxFirmware(firmware);
 
+  /* FrSky X3 board */
+  firmware = new OpenTxFirmware("opentx-x3", Firmware::tr("FrSky Taranis X3"), BOARD_TARANIS_X3);
+  addOpenTxTaranisOptions(firmware, false);
+  registerOpenTxFirmware(firmware);
+
   /* FrSky X7 board */
   firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
   addOpenTxTaranisOptions(firmware, false);