diff --git a/overlay/encore/packages/apps/CMParts/res/values/config.xml b/overlay/encore/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 00000000..22dfadbb
--- /dev/null
+++ b/overlay/encore/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">false</bool>
+
+    <bool name="has_led_flash">false</bool>
+</resources>
+
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 5a812635..2b72e595 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -6,6 +6,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_buzz.mk \
     $(LOCAL_DIR)/cyanogen_click.mk \
     $(LOCAL_DIR)/cyanogen_crespo.mk \
+    $(LOCAL_DIR)/cyanogen_encore.mk \
     $(LOCAL_DIR)/cyanogen_espresso.mk \
     $(LOCAL_DIR)/cyanogen_hero.mk \
     $(LOCAL_DIR)/cyanogen_heroc.mk \
diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk
new file mode 100644
index 00000000..f6ba7682
--- /dev/null
+++ b/products/cyanogen_encore.mk
@@ -0,0 +1,38 @@
+# Inherit AOSP device configuration for encore.
+$(call inherit-product, device/bn/encore/device_encore.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_encore
+PRODUCT_BRAND := bn
+PRODUCT_DEVICE := encore
+PRODUCT_MODEL := NookColor
+PRODUCT_MANUFACTURER := bn
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=encore BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/encore
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-encore
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC1-encore
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC1-encore-KANG
+    endif
+endif
+
+
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
index f66a232e..3e5860f6 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -6,6 +6,7 @@ add_lunch_combo cyanogen_buzz-eng
 add_lunch_combo cyanogen_click-eng
 add_lunch_combo cyanogen_crespo-eng
 #add_lunch_combo cyanogen_dream_sapphire-eng
+add_lunch_combo cyanogen_encore-eng
 add_lunch_combo cyanogen_espresso-eng
 add_lunch_combo cyanogen_generic-eng
 add_lunch_combo cyanogen_glacier-eng