diff --git a/bcmbt/bluetooth.mk b/bcmbt/bluetooth.mk
index 870467a..fd41363 100644
--- a/bcmbt/bluetooth.mk
+++ b/bcmbt/bluetooth.mk
@@ -1,2 +1,8 @@
-PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.bcmbtlinux
+PRODUCT_SOONG_NAMESPACES += vendor/broadcom/bluetooth
+PRODUCT_PACKAGES += \
+       android.hardware.bluetooth@1.1-service.bcmbtlinux \
+       bt_vendor.conf
 BOARD_SEPOLICY_DIRS += device/google/gs-common/bcmbt/sepolicy
+
+DEVICE_MANIFEST_FILE += device/google/gs-common/bcmbt/manifest_bluetooth.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bcmbt/compatibility_matrix.xml