Add Sholes
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 7ba1caf..14e8e9f 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -2,3 +2,4 @@
         $(LOCAL_DIR)/cyanogen_passion.mk \
         $(LOCAL_DIR)/cyanogen_incredible.mk \
         $(LOCAL_DIR)/cyanogen_heroc.mk \
+        $(LOCAL_DIR)/cyanogen_sholes.mk
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
new file mode 100644
index 0000000..8b3c3ce
--- /dev/null
+++ b/products/cyanogen_sholes.mk
@@ -0,0 +1,25 @@
+# Inherit AOSP device configuration for passion.
+$(call inherit-product, device/motorola/sholes/sholes.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_sholes
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := sholes
+PRODUCT_MODEL := Droid
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.0.0-N1-test0
+endif
diff --git a/vendorsetup.sh b/vendorsetup.sh
index f8f9c1f..ee39837 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,6 +1,4 @@
-add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_passion-userdebug
-add_lunch_combo cyanogen_incredible-eng
 add_lunch_combo cyanogen_incredible-userdebug
-add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_heroc-userdebug
+add_lunch_combo cyanogen_sholes-userdebug