diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 96b3038..e792199 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -127,6 +127,7 @@ BOARD_LEGACY_NL80211_STA_EVENTS  := true
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_BLUEDROID_VENDOR_CONF := device/samsung/galaxys2-common/bluetooth/vnd_smdk4210.txt
 
 # Vold
 BOARD_VOLD_MAX_PARTITIONS := 12
diff --git a/bluetooth/vnd_smdk4210.txt b/bluetooth/vnd_smdk4210.txt
new file mode 100644
index 0000000..4b18989
--- /dev/null
+++ b/bluetooth/vnd_smdk4210.txt
@@ -0,0 +1,12 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttySAC0"
+FW_PATCHFILE_LOCATION = "/system/bin/"
+BT_WAKE_VIA_PROC = TRUE
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+BTVND_DBG = FALSE
+BTHW_DBG = TRUE
+VNDUSERIAL_DBG = FALSE
+UPIO_DBG = FALSE
+UART_TARGET_BAUD_RATE = 4000000
+FW_PATCH_SETTLEMENT_DELAY_MS = 50
+PCM_DATA_FMT_FILL_METHOD = 3
+PCM_DATA_FMT_FILL_NUM = 3
diff --git a/init.smdk4210.rc b/init.smdk4210.rc
index 6523b8f..df58d6c 100644
--- a/init.smdk4210.rc
+++ b/init.smdk4210.rc
@@ -380,16 +380,6 @@ service iprenew_p2p /system/bin/dhcpcd -n
     disabled
     oneshot
 
-# for bluetooth
-service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm --no2bytes --tosleep 50000 \
-    --baudrate 3000000 --use_baudrate_for_download --patchram /system/bin/bcm4330B1.hcd \
-    --scopcm=0,0,0,0,0,0,0,3,3,0  /dev/ttySAC0
-    class main
-    user bluetooth
-    group bluetooth net_bt_admin
-    disabled
-    oneshot
-
 # bluetooth mac address
 service bdaddr /system/bin/bdaddr_read
     class main
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index b621eae..ff14dd5 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -80,7 +80,7 @@
          bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
          should be empty. -->
     <string-array translatable="false" name="config_tether_bluetooth_regexs">
-        <item>"bnep\\d"</item>
+        <item>"bt-pan"</item>
     </string-array>
 
     <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->