diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py
index b52dcac2b6..1885b76806 100644
--- a/Tools/ardupilotwaf/chibios.py
+++ b/Tools/ardupilotwaf/chibios.py
@@ -243,6 +243,10 @@ class generate_apj(Task.Task):
             "board_revision": 0,
             "USBID": self.env.USBID
         }
+        if self.env.MANUFACTURER:
+            d["manufacturer"] = self.env.MANUFACTURER
+        if self.env.BRAND_NAME:
+            d["brand_name"] = self.env.BRAND_NAME
         if self.env.build_dates:
             # we omit build_time when we don't have build_dates so that apj
             # file is idential for same git hash and compiler
diff --git a/Tools/scripts/generate_manifest.py b/Tools/scripts/generate_manifest.py
index 36ac0426b1..0639e6dcec 100755
--- a/Tools/scripts/generate_manifest.py
+++ b/Tools/scripts/generate_manifest.py
@@ -275,8 +275,9 @@ class ManifestGenerator():
             (brand_name, manufacturer) = brand_map[platform]
             firmware['brand_name'] = brand_name
             firmware['manufacturer'] = manufacturer
+
         # copy over some extra information if available
-        extra_tags = [ 'image_size' ]
+        extra_tags = [ 'image_size', 'brand_name', 'manufacturer' ]
         for tag in extra_tags:
             if tag in apj_json:
                 firmware[tag] = apj_json[tag]