diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0265485..5c887c0 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,7 +1,5 @@
 -include device/samsung/msm8226-common/BoardConfigCommon.mk
 
-TARGET_INIT_VENDOR_LIB := libinit_rubenslte
-
 TARGET_OTA_ASSERT_DEVICE := rubenslte,rubensltexx
 DEVICE_PATH := device/samsung/rubenslte
 
@@ -12,6 +10,11 @@ BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x02000000 -
 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=23
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
+BOARD_HAVE_QCOM_FM := true
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
+BOARD_HAVE_BLUETOOTH_QCOM := true
+QCOM_BT_USE_BTNV := true
+
 BOARD_BOOTIMAGE_PARTITION_SIZE := 10485248
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 10485248
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2411724288
@@ -24,5 +27,6 @@ TARGET_KERNEL_CONFIG := lineage_rubenslte_defconfig
 
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
+TARGET_INIT_VENDOR_LIB := libinit_rubenslte
 
 -include vendor/samsung/rubenslte/BoardConfigVendor.mk
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 0000000..d5e0c3c
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,9 @@
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+#define BTM_DEF_LOCAL_NAME   "Samsung Galaxy Tab Active"
+
+#define BTM_WBS_INCLUDED TRUE
+#define BTIF_HF_WBS_PREFERRED TRUE
+
+#endif