diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index a20c2a9c..36689efd 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -19,6 +19,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_leo.mk \
     $(LOCAL_DIR)/cyanogen_liberty.mk \
+    $(LOCAL_DIR)/cyanogen_mecha.mk \
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
new file mode 100644
index 00000000..98def870
--- /dev/null
+++ b/products/cyanogen_mecha.mk
@@ -0,0 +1,49 @@
+# Inherit device configuration for mecha.
+$(call inherit-product, device/htc/mecha/device_mecha.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_mecha
+PRODUCT_BRAND := htc_wwe
+PRODUCT_DEVICE := mecha
+PRODUCT_MODEL := ThunderBolt
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_mecha BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=verizon_wwe/htc_mecha/mecha/mecha:2.2.1/FRG83D/338893:user/release-keys PRIVATE_BUILD_DESC="1.12.605.6 CL338893 release-keys"
+
+# Extra Mecha overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mecha
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+# SIM Toolkit
+PRODUCT_PACKAGES += Stk
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Thunderbolt
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-Thunderbolt
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-Thunderbolt-KANG
+    endif
+endif
+
+#
+# Copy passion 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 456beda1..7e4b4508 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -18,6 +18,7 @@ add_lunch_combo cyanogen_inc-eng
 add_lunch_combo cyanogen_legend-eng
 add_lunch_combo cyanogen_leo-eng
 add_lunch_combo cyanogen_liberty-eng
+add_lunch_combo cyanogen_mecha-eng
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng