diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 818fa178..dc80c134 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -1,20 +1,21 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/cyanogen_passion.mk \
-    $(LOCAL_DIR)/cyanogen_inc.mk \
-    $(LOCAL_DIR)/cyanogen_hero.mk \
-    $(LOCAL_DIR)/cyanogen_heroc.mk \
-    $(LOCAL_DIR)/cyanogen_sholes.mk \
-    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
+    $(LOCAL_DIR)/cyanogen_ace.mk \
     $(LOCAL_DIR)/cyanogen_bravo.mk \
     $(LOCAL_DIR)/cyanogen_bravoc.mk \
     $(LOCAL_DIR)/cyanogen_buzz.mk \
+    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
     $(LOCAL_DIR)/cyanogen_espresso.mk \
-    $(LOCAL_DIR)/cyanogen_supersonic.mk \
+    $(LOCAL_DIR)/cyanogen_glacier.mk \
+    $(LOCAL_DIR)/cyanogen_harmony.mk \
+    $(LOCAL_DIR)/cyanogen_hero.mk \
+    $(LOCAL_DIR)/cyanogen_heroc.mk \
+    $(LOCAL_DIR)/cyanogen_inc.mk \
+    $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_liberty.mk \
+    $(LOCAL_DIR)/cyanogen_one.mk \
+    $(LOCAL_DIR)/cyanogen_passion.mk \
+    $(LOCAL_DIR)/cyanogen_sholes.mk \
+    $(LOCAL_DIR)/cyanogen_supersonic.mk \
     $(LOCAL_DIR)/cyanogen_vibrant.mk \
-    $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_one.mk \
-    $(LOCAL_DIR)/cyanogen_z71.mk \
-    $(LOCAL_DIR)/cyanogen_glacier.mk \
-    $(LOCAL_DIR)/cyanogen_harmony.mk
+    $(LOCAL_DIR)/cyanogen_z71.mk
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
new file mode 100644
index 00000000..b55816be
--- /dev/null
+++ b/products/cyanogen_ace.mk
@@ -0,0 +1,48 @@
+# Inherit device configuration for ace.
+$(call inherit-product, device/htc/ace/ace.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_ace
+PRODUCT_BRAND := htc_wwe
+PRODUCT_DEVICE := ace
+PRODUCT_MODEL := HTC Desire HD
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace/ace:2.2/FRF91/278359:user/release-keys PRIVATE_BUILD_DESC="1.32.405.6 CL278359 release-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_ace_defconfig
+
+# Include the Torch and FM apps
+PRODUCT_PACKAGES += \
+    Torch
+#    FM    
+
+# Extra Vision overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DHD
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.1.0-RC1-DHD
+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 3caee2c6..14f5c0e5 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,21 +1,22 @@
-add_lunch_combo cyanogen_passion-eng
-add_lunch_combo cyanogen_inc-eng
-add_lunch_combo cyanogen_hero-eng
-add_lunch_combo cyanogen_heroc-eng
-add_lunch_combo cyanogen_sholes-eng
-add_lunch_combo cyanogen_dream_sapphire-eng
+add_lunch_combo cyanogen_ace-eng
 add_lunch_combo cyanogen_bravo-eng
 add_lunch_combo cyanogen_bravoc-eng
+add_lunch_combo cyanogen_buzz-eng
+add_lunch_combo cyanogen_dream_sapphire-eng
 add_lunch_combo cyanogen_espresso-eng
-add_lunch_combo cyanogen_supersonic-eng
+add_lunch_combo cyanogen_glacier-eng
+add_lunch_combo cyanogen_harmony-eng
+add_lunch_combo cyanogen_hero-eng
+add_lunch_combo cyanogen_heroc-eng
+add_lunch_combo cyanogen_inc-eng
+add_lunch_combo cyanogen_legend-eng
 add_lunch_combo cyanogen_liberty-eng
+add_lunch_combo cyanogen_one-eng
+add_lunch_combo cyanogen_passion-eng
+add_lunch_combo cyanogen_sholes-eng
+add_lunch_combo cyanogen_supersonic-eng
 add_lunch_combo cyanogen_vibrant-eng
-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
-add_lunch_combo cyanogen_glacier-eng
-add_lunch_combo cyanogen_harmony-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH