diff --git a/product/AndroidProducts.mk b/product/AndroidProducts.mk
index c5120cde..27005a09 100644
--- a/product/AndroidProducts.mk
+++ b/product/AndroidProducts.mk
@@ -1,2 +1,3 @@
 PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/cyanogen_passion.mk \
+        $(LOCAL_DIR)/cyanogen_incredible.mk \
diff --git a/product/cyanogen_incredible.mk b/product/cyanogen_incredible.mk
new file mode 100644
index 00000000..947f9b8f
--- /dev/null
+++ b/product/cyanogen_incredible.mk
@@ -0,0 +1,24 @@
+$(call inherit-product, device/htc/inc/inc.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/product/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_incredible
+PRODUCT_BRAND := verizon
+PRODUCT_DEVICE := incredible
+PRODUCT_MODEL := Incredible
+PRODUCT_MANUFACTURER := HTC
+
+#
+# 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 4a3d938e..e0694de4 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,2 +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