diff --git a/ChangeLog.md b/ChangeLog.md
index e230561af0a5d1810e1d55bf94bb6abaabb59a2f..a93f9093f7f2104bb4ed3c5c675c139074665c59 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -6,12 +6,11 @@ Note: This file only contains high level features or important fixes.
 
 ### 3.6.0 - Daily Build
 
+* Improved support for flashing/connecting to ChibiOS bootloaders boards.
 * Making the camera API available to all firmwares, not just PX4.
 * ArduPilot: Support configurable mavlink stream rates. Available from Settings/Mavlink page.
 * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
 
-* Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
-
 ### 3.5.1 - Not yet released
 * Fix tile set count but in OfflineMaps which would cause image and elevation tile set to have incorrect counts and be incorrectly marked as download incomplete.
 
diff --git a/src/comm/QGCSerialPortInfo.cc b/src/comm/QGCSerialPortInfo.cc
index 539a8c7ddaf7b688221be24e5dc7224ba75f2fb1..18188356e38a38de7bbc101e77187b0f9756acf1 100644
--- a/src/comm/QGCSerialPortInfo.cc
+++ b/src/comm/QGCSerialPortInfo.cc
@@ -225,7 +225,7 @@ bool QGCSerialPortInfo::getBoardInfo(QGCSerialPortInfo::BoardType_t& boardType,
     for (int i=0; i<_boardInfoList.count(); i++) {
         const BoardInfo_t& boardInfo = _boardInfoList[i];
 
-        if (vendorIdentifier() == boardInfo.vendorId && productIdentifier() == boardInfo.productId) {
+        if (vendorIdentifier() == boardInfo.vendorId && (productIdentifier() == boardInfo.productId || boardInfo.productId == 0)) {
             boardType = boardInfo.boardType;
             name = boardInfo.name;
             return true;
diff --git a/src/comm/USBBoardInfo.json b/src/comm/USBBoardInfo.json
index 6a91abb6b0a8c06689d8c601893f75b87df5844e..b5f39dbf4850e9bb87ef235e23529c4583b4d41d 100644
--- a/src/comm/USBBoardInfo.json
+++ b/src/comm/USBBoardInfo.json
@@ -21,6 +21,11 @@
         { "vendorID": 9900, "productID": 1,         "boardClass": "Pixhawk",    "name": "Omnibus F4 SD" },
         { "vendorID": 8137, "productID": 28,        "boardClass": "Pixhawk",    "name": "PX4 NXPHlite v3.x" },
 
+        { "vendorID": 1155, "productID": 22336,     "boardClass": "Pixhawk",    "name": "ArduPilot ChibiOS" },
+        { "vendorID": 4617, "productID": 22336,     "boardClass": "Pixhawk",    "name": "ArduPilot ChibiOS" },
+
+        { "vendorID": 12642, "productID": 0,        "boardClass": "Pixhawk",    "name": "Holybro" },
+
         { "vendorID": 9900, "productID": 21,        "boardClass": "PX4 Flow",   "name": "PX4 Flow" },
 
         { "vendorID": 1027, "productID": 24597,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "3DR Radio" },