diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py
index 5e1a7e7fd0..aee0d4362f 100644
--- a/Tools/ardupilotwaf/chibios.py
+++ b/Tools/ardupilotwaf/chibios.py
@@ -155,7 +155,8 @@ class generate_apj(Task.Task):
             "version": "0.1",
             "image_size": len(img),
             "git_identity": self.generator.bld.git_head_hash(short=True),
-            "board_revision": 0
+            "board_revision": 0,
+            "USBID": self.env.USBID
         }
         if self.env.build_dates:
             # we omit build_time when we don't have build_dates so that apj
diff --git a/Tools/scripts/generate_manifest.py b/Tools/scripts/generate_manifest.py
index b1985f5610..a0c10cc545 100755
--- a/Tools/scripts/generate_manifest.py
+++ b/Tools/scripts/generate_manifest.py
@@ -187,7 +187,10 @@ class ManifestGenerator():
             'VRCore-v10': ['0x27AC/0x1910'],
             'VRUBrain-v51': ['0x27AC/0x1351']
         }
-        if platform in USBID_MAP:
+        if 'USBID' in apj_json:
+            # newer APJ files have USBID in the json data
+            firmware['USBID'] = apj_json['USBID']
+        elif platform in USBID_MAP:
             firmware['USBID'] = USBID_MAP[platform]
         else:
             # all others use a single USB VID/PID