diff --git a/src/Comms/USBBoardInfo.json b/src/Comms/USBBoardInfo.json
index 7c4c2afb9db..ab4af34ce32 100644
--- a/src/Comms/USBBoardInfo.json
+++ b/src/Comms/USBBoardInfo.json
@@ -63,9 +63,12 @@
         { "vendorID": 8352, "productID": 16733,     "boardClass": "OpenPilot",  "name": "OpenPilot CC3D" },
         { "vendorID": 8352, "productID": 16734,     "boardClass": "OpenPilot",  "name": "OpenPilot Revolution" },
         { "vendorID": 8352, "productID": 16848,     "boardClass": "OpenPilot",  "name": "Taulabs Sparky2" }
+        { "vendorID": 13891, "productID": 5600,     "boardClass": "Pixhawk",    "name": "ZeroOne X6" },
     ],
 
     "boardDescriptionFallback": [
+        { "regExp": "^ZeroOne x6.x$",       "boardClass": "Pixhawk" },
+        { "regExp": "^ZeroOne BL x6.x$",    "boardClass": "Pixhawk" },
         { "regExp": "^PX4 FMU v6U.x$",      "boardClass": "Pixhawk" },
         { "regExp": "^PX4 BL FMU v6U.x$",   "boardClass": "Pixhawk" },
         { "regExp": "^PX4 FMU v6X.x$",      "boardClass": "Pixhawk" },
diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index 35f34f01b4b..793cf8fec79 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -90,6 +90,7 @@ static QMap<int, QString> px4_board_name_map {
     {1110, "jfb_jfb110_default"},
     {1123, "siyi_n7_default"},    
     {1124, "3dr_ctrl-zero-h7-oem-revg_default"},
+    {5600, "zeroone_x6_default"},
 };
 
 uint qHash(const FirmwareUpgradeController::FirmwareIdentifier& firmwareId)