diff --git a/bluetooth/bcm4335_prepatch.hcd b/bluetooth/bcm4335_prepatch.hcd
new file mode 100644
index 000000000..cd1813b71
Binary files /dev/null and b/bluetooth/bcm4335_prepatch.hcd differ
diff --git a/bluetooth/vnd_jf.txt b/bluetooth/vnd_jf.txt
index 762f57dd1..7199e2db3 100644
--- a/bluetooth/vnd_jf.txt
+++ b/bluetooth/vnd_jf.txt
@@ -1,5 +1,6 @@
 BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0"
 FW_PATCHFILE_LOCATION = "/vendor/firmware"
+FW_PRE_PATCH="/vendor/firmware/bcm4335_prepatch.hcd"
 BT_WAKE_VIA_PROC = TRUE
 LPM_IDLE_TIMEOUT_MULTIPLE = 5
 BTVND_DBG = FALSE
diff --git a/jf-common.mk b/jf-common.mk
index 980679521..082437bdd 100644
--- a/jf-common.mk
+++ b/jf-common.mk
@@ -119,6 +119,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # QRNGD
 PRODUCT_PACKAGES += qrngd
 
+# Prepatch to fix BT/WiFi bus lockups
+PRODUCT_COPY_FILES += device/samsung/jf-common/bluetooth/bcm4335_prepatch.hcd:system/vendor/firmware/bcm4335_prepatch.hcd
+
 #common build.props
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.chipname=apq8064 \