diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 8dcfa87..37453fe 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -51,6 +51,7 @@
 * Xperia Neo (MT15i): Bin4ry,defer,jerpelea (FreeXperia team)
 * Xperia Play (R800i): Bin4ry,defer,jerpelea (FreeXperia team)
 * Droid2we (Droid2 Global): RevNumbers, x13thangelx
+* V9 (ZTE Light, Optus MyTab, others): kallt_kaffe and Tom Giordano
 
 Translators:
 ------------
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 3a927db..2f3ac39 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -44,6 +44,7 @@
     $(LOCAL_DIR)/cyanogen_smb_b9701.mk \
     $(LOCAL_DIR)/cyanogen_speedy.mk \
     $(LOCAL_DIR)/cyanogen_supersonic.mk \
+    $(LOCAL_DIR)/cyanogen_v9.mk \
     $(LOCAL_DIR)/cyanogen_u8220.mk \
     $(LOCAL_DIR)/cyanogen_vega.mk \
     $(LOCAL_DIR)/cyanogen_vibrantmtd.mk \
diff --git a/products/cyanogen_v9.mk b/products/cyanogen_v9.mk
new file mode 100644
index 0000000..00fe406
--- /dev/null
+++ b/products/cyanogen_v9.mk
@@ -0,0 +1,40 @@
+# Inherit AOSP device configuration for v9.
+$(call inherit-product, device/zte/v9/device_v9.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_v9
+PRODUCT_BRAND := zte
+PRODUCT_DEVICE := v9
+PRODUCT_MODEL := V9
+PRODUCT_MANUFACTURER := ZTE
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=v9 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-V9
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-V9
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-V9-KANG
+    endif
+endif
+
+#
+# Copy legend specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index cc7ea64..d1ae0b7 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -44,6 +44,7 @@
 add_lunch_combo cyanogen_speedy-eng
 add_lunch_combo cyanogen_supersonic-eng
 add_lunch_combo cyanogen_u8220-eng
+add_lunch_combo cyanogen_v9-eng
 add_lunch_combo cyanogen_vega-eng
 add_lunch_combo cyanogen_vibrantmtd-eng
 add_lunch_combo cyanogen_vision-eng