diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 1c52d626..10f9c93c 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -14,4 +14,5 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_vibrant.mk \
     $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_one.mk
+    $(LOCAL_DIR)/cyanogen_one.mk \
+    $(LOCAL_DIR)/cyanogen_z71.mk
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
new file mode 100644
index 00000000..7c6b66e8
--- /dev/null
+++ b/products/cyanogen_z71.mk
@@ -0,0 +1,37 @@
+# Inherit AOSP device configuration for z71.
+$(call inherit-product, device/commtiva/z71/device_z71.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_z71
+PRODUCT_BRAND := commtiva
+PRODUCT_DEVICE := z71
+PRODUCT_MODEL := Z71
+PRODUCT_MANUFACTURER := Commtiva
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
+
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-z71.map
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Z71
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.1.0-RC2-Z71
+endif
+
+#
+# Copy legend specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 1d2d6f9b..f396181b 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,5 +14,6 @@ add_lunch_combo cyanogen_legend-eng
 add_lunch_combo cyanogen_vision-eng
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_buzz-eng
+add_lunch_combo cyanogen_z71-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH