diff --git a/Tools/bootloaders/MambaF405v2_bl.bin b/Tools/bootloaders/MambaF405v2_bl.bin
new file mode 100755
index 0000000000..520efd15db
Binary files /dev/null and b/Tools/bootloaders/MambaF405v2_bl.bin differ
diff --git a/Tools/bootloaders/MambaF405v2_bl.hex b/Tools/bootloaders/MambaF405v2_bl.hex
new file mode 100644
index 0000000000..af8a6fe0e9
Binary files /dev/null and b/Tools/bootloaders/MambaF405v2_bl.hex differ
diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py
index ffb4f39759..8efe406786 100755
--- a/Tools/scripts/build_binaries.py
+++ b/Tools/scripts/build_binaries.py
@@ -389,7 +389,7 @@ is bob we will attempt to checkout bob-AVR'''
 
                 if self.skip_board_waf(board):
                     continue
-                
+
                 if os.path.exists(self.buildroot):
                     shutil.rmtree(self.buildroot)
 
@@ -570,6 +570,7 @@ is bob we will attempt to checkout bob-AVR'''
                 "KakuteF4",
                 "KakuteF7",
                 "KakuteF7Mini",
+                "MambaF405v2",
                 "MatekF405",
                 "MatekF405-STD",
                 "MatekF405-Wing",
@@ -705,7 +706,7 @@ is bob we will attempt to checkout bob-AVR'''
                            "AP_Periph",
                            "AP_Periph")
 
-        
+
     def generate_manifest(self):
         '''generate manigest files for GCS to download'''
         self.progress("Generating manifest")
diff --git a/Tools/scripts/generate_manifest.py b/Tools/scripts/generate_manifest.py
index 902a12c1d8..50628998f3 100755
--- a/Tools/scripts/generate_manifest.py
+++ b/Tools/scripts/generate_manifest.py
@@ -38,6 +38,7 @@ brand_map = {
     'CUAV-Nora' : ('CUAV Nora', 'CUAV'),
     'CUAV-X7' : ('CUAV X7', 'CUAV'),
     'DrotekP3Pro' : ('Pixhawk 3 Pro', 'Drotek'),
+    'MambaF405v2' : ('Diatone Mamba F405 MK2', 'Diatone'),
     'MatekF405' : ('Matek F405', 'Matek'),
     'MatekF405-STD' : ('Matek F405 STD', 'Matek'),
     'MatekF405-Wing' : ('Matek F405 Wing', 'Matek'),