diff --git a/Android.mk b/Android.mk
index 913c607..35eab8a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,5 +47,8 @@
 ifeq ($(TARGET_PRODUCT), full_wingray)
     include $(LOCAL_PATH)/conf/moto/wingray/Android.mk
 endif
+ifeq ($(TARGET_PRODUCT), gce_x86_phone)
+    include $(LOCAL_PATH)/conf/google/gce_x86/Android.mk
+endif
 
 endif # BOARD_HAVE_BLUETOOTH_BCM
diff --git a/conf/google/gce_x86/Android.mk b/conf/google/gce_x86/Android.mk
new file mode 100644
index 0000000..974e213
--- /dev/null
+++ b/conf/google/gce_x86/Android.mk
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := bt_vendor.conf
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+
+LOCAL_MODULE_TAGS := eng
+
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+
+include $(BUILD_PREBUILT)
+
diff --git a/conf/google/gce_x86/bt_vendor.conf b/conf/google/gce_x86/bt_vendor.conf
new file mode 100644
index 0000000..2274015
--- /dev/null
+++ b/conf/google/gce_x86/bt_vendor.conf
@@ -0,0 +1,5 @@
+# UART device port where Bluetooth controller is attached
+UartPort=/dev/bluetooth/slave
+
+# Firmware patch file location
+FwPatchFilePath = /vendor/firmware/