diff --git a/overlay/droid2/packages/apps/CMParts/res/values/config.xml b/overlay/droid2/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 00000000..b9582a84
--- /dev/null
+++ b/overlay/droid2/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_camera_button">true</bool>
+    <bool name="has_rgb_notification_led">true</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 75993e85..83153971 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -10,6 +10,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_crespo4g.mk \
     $(LOCAL_DIR)/cyanogen_desirec.mk \
     $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
+    $(LOCAL_DIR)/cyanogen_droid2.mk \
     $(LOCAL_DIR)/cyanogen_encore.mk \
     $(LOCAL_DIR)/cyanogen_espresso.mk \
     $(LOCAL_DIR)/cyanogen_hero.mk \
diff --git a/products/cyanogen_droid2.mk b/products/cyanogen_droid2.mk
new file mode 100644
index 00000000..a82622ee
--- /dev/null
+++ b/products/cyanogen_droid2.mk
@@ -0,0 +1,40 @@
+# Inherit AOSP device configuration for passion.
+$(call inherit-product, device/motorola/droid2/droid2.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_droid2
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := droid2
+PRODUCT_MODEL := DROID2
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7.1-$(shell date +%m%d%Y)-NIGHTLY-DROID2-KANG
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-DROID2
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-DROID2-KANG
+    endif
+endif
+
+PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=droid2_vzw TARGET_DEVICE=cdma_droid2 BUILD_FINGERPRINT=verizon/droid2_vzw/cdma_droid2/droid2:2.2/VZW/23.20:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_droid2-user 2.2 VZW 2.3.20 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.20 BUILD_UTC_DATE=1284778494 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=dbretzm1
+
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/droid2
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 9fa60fe5..63ab528f 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -9,6 +9,7 @@ add_lunch_combo cyanogen_crespo-eng
 add_lunch_combo cyanogen_crespo4g-eng
 add_lunch_combo cyanogen_desirec-eng
 add_lunch_combo cyanogen_dream_sapphire-eng
+add_lunch_combo cyanogen_droid2-eng
 add_lunch_combo cyanogen_encore-eng
 add_lunch_combo cyanogen_espresso-eng
 add_lunch_combo cyanogen_galaxysmtd-eng