diff --git a/BoardConfig.mk b/BoardConfig.mk
index 348aaae..3adcf82 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -60,6 +60,7 @@ endif
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_FORCE_STATIC_A2DP := true
 
 # gps
 BOARD_USES_GPSWRAPPER := true
@@ -87,7 +88,7 @@ BOARD_FLASH_BLOCK_SIZE := 4096
 WPA_SUPPLICANT_VERSION := VER_0_6_X
 BOARD_WPA_SUPPLICANT_DRIVER := WEXT
 # galaxys2 uses bcm4330
-BOARD_WLAN_DEVICE := bcm4329
+BOARD_WLAN_DEVICE := bcm4330
 WIFI_DRIVER_MODULE_PATH     := "/lib/modules/dhd.ko"
 WIFI_DRIVER_FW_STA_PATH     := "/system/vendor/firmware/bcm4330_sta.bin"
 WIFI_DRIVER_FW_AP_PATH      := "/system/vendor/firmware/bcm4330_aps.bin"
diff --git a/dhd.ko b/dhd.ko
index 1f2c7c1..99fe548 100644
Binary files a/dhd.ko and b/dhd.ko differ
diff --git a/kernel b/kernel
index 2c29fbf..b102c50 100755
Binary files a/kernel and b/kernel differ