diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index c493faf7..787a828d 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -5,6 +5,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_buzz.mk \
     $(LOCAL_DIR)/cyanogen_crespo.mk \
     $(LOCAL_DIR)/cyanogen_inc.mk \
+    $(LOCAL_DIR)/cyanogen_generic.mk \
     $(LOCAL_DIR)/cyanogen_glacier.mk \
     $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_liberty.mk \
diff --git a/products/cyanogen_generic.mk b/products/cyanogen_generic.mk
new file mode 100644
index 00000000..5f1213fc
--- /dev/null
+++ b/products/cyanogen_generic.mk
@@ -0,0 +1,22 @@
+# Inherit AOSP device configuration for generic target
+$(call inherit-product, build/target/product/full.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_generic
+PRODUCT_BRAND := cyanogenmod
+PRODUCT_DEVICE := generic
+PRODUCT_MODEL := CyanogenMod
+PRODUCT_MANUFACTURER := CyanogenMod
+
+#
+# Move dalvik cache to data partition where there is more room to solve startup problems
+#
+PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
+
+# Generic modversion
+ro.modversion=CyanogenMod-7
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 648fefa9..23144925 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -5,6 +5,7 @@ add_lunch_combo cyanogen_crespo-eng
 add_lunch_combo cyanogen_buzz-eng
 #add_lunch_combo cyanogen_dream_sapphire-eng
 #add_lunch_combo cyanogen_espresso-eng
+add_lunch_combo cyanogen_generic-eng
 add_lunch_combo cyanogen_glacier-eng
 #add_lunch_combo cyanogen_harmony-eng
 #add_lunch_combo cyanogen_hero-eng