diff --git a/BoardConfig.mk b/BoardConfig.mk
index d100af7..4988a33 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Default values, possibly overridden by BoardConfigVendor.mk
+TARGET_BOARD_INFO_FILE := device/samsung/toroplus/board-info.txt
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/toroplus/bluetooth
+
 # Use the non-open-source part, if present
 -include vendor/samsung/toroplus/BoardConfigVendor.mk
 
-# Use the open-source board-info file if none was set by the vendor
-# config.
-TARGET_BOARD_INFO_FILE ?= device/samsung/toroplus/board-info.txt
-
 # Use the part that is common between all tunas
 include device/samsung/tuna/BoardConfig.mk
 
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 0000000..0bd120a
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+#define BTM_DEF_LOCAL_NAME   "Galaxy NexusCDMA 2"
+
+#endif
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index aa572ba..fd1c841 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -14,13 +14,26 @@
 
 # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT
 
+/system/app/BIP.apk
+/system/app/SDM.apk
+/system/app/SecPhone.apk
+/system/app/SprintExtension.apk
+/system/app/SyncMLSvc.apk
 /system/bin/fRom
+/system/lib/libdrmdecrypt.so
+/system/lib/libsecril-client.so
+/system/lib/libsyncml_core.so
+/system/lib/libsyncml_port.so
+/system/lib/lib_gsd4t.so
 /system/vendor/bin/pvrsrvctl
+/system/vendor/etc/sirfgps.conf
+/system/vendor/firmware/bcm4330.hcd
 /system/vendor/firmware/ducati-m3.bin
 /system/vendor/firmware/libpn544_fw.so
 /system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so
 /system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so
 /system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so
+/system/vendor/lib/hw/gps.omap4.so
 /system/vendor/lib/hw/gralloc.omap4.so
 /system/vendor/lib/libglslcompiler.so
 /system/vendor/lib/libIMGegl.so
@@ -28,6 +41,7 @@
 /system/vendor/lib/libpvr2d.so
 /system/vendor/lib/libpvrANDROID_WSEGL.so
 /system/vendor/lib/libPVRScopeServices.so
+/system/vendor/lib/libsec-ril_lte.so
 /system/vendor/lib/libsrv_init.so
 /system/vendor/lib/libsrv_um.so
 /system/vendor/lib/libusc.so