diff --git a/board-info.txt b/board-info.txt
index 597e279..a38086e 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,4 @@
 require mid=P*
 require board=bravo|leo|htcleo
+require device=bravo|leo|htcleo
 require version-microp=031d
diff --git a/firmware/bcm4329.hcd b/firmware/bcm4329.hcd
deleted file mode 100644
index 0b6ead2..0000000
Binary files a/firmware/bcm4329.hcd and /dev/null differ
diff --git a/firmware/fw_bcm4329.bin b/firmware/fw_bcm4329.bin
new file mode 100755
index 0000000..14601cc
Binary files /dev/null and b/firmware/fw_bcm4329.bin differ
diff --git a/firmware/fw_bcm4329_apsta.bin b/firmware/fw_bcm4329_apsta.bin
new file mode 100755
index 0000000..975c58c
Binary files /dev/null and b/firmware/fw_bcm4329_apsta.bin differ
diff --git a/leo.mk b/leo.mk
index 1dff26f..73c08e3 100755
--- a/leo.mk
+++ b/leo.mk
@@ -119,6 +119,12 @@ PRODUCT_COPY_FILES += \
     device/htc/leo/leo-keypad.kcm.bin:system/usr/keychars/leo-keypad.kcm.bin \
     device/htc/leo/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl
 
+# Firmware
+PRODUCT_COPY_FILES += \
+    device/htc/supersonic/firmware/fw_bcm4329.bin:system/etc/firmware/fw_bcm4329.bin \
+    device/htc/supersonic/firmware/fw_bcm4329_apsta.bin:system/etc/firmware/fw_bcm4329_apsta.bin
+
+
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := device/htc/leo/kernel
 else