diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 21d28b69..f8fe4c89 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -5,4 +5,5 @@ PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/cyanogen_sholes.mk \
 	$(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
 	$(LOCAL_DIR)/cyanogen_bravo.mk \
-	$(LOCAL_DIR)/cyanogen_espresso.mk
+	$(LOCAL_DIR)/cyanogen_espresso.mk \
+	$(LOCAL_DIR)/cyanogen_supersonic.mk
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
new file mode 100644
index 00000000..4328a2fd
--- /dev/null
+++ b/products/cyanogen_supersonic.mk
@@ -0,0 +1,50 @@
+# Inherit AOSP device configuration for supersonic.
+$(call inherit-product, device/htc/supersonic/supersonic.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_supersonic
+PRODUCT_BRAND := htc
+PRODUCT_DEVICE := supersonic
+PRODUCT_MODEL := HTC Evo
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys
+PRIVATE_BUILD_DESC="supersonic-user 2.2 FRF91 43546 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_mahimahi_defconfig
+
+# Extra Passion overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
+
+# Extra RIL settings
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.ril.enable.managed.roaming=1 \
+    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
+    ro.ril.emc.mode=2
+
+# Enable Windows Media
+WITH_WINDOWS_MEDIA := true
+
+#
+# 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-Supersonic-RC1
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index e7dcebcd..233b7d79 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -5,3 +5,4 @@ add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_dream_sapphire-eng
 add_lunch_combo cyanogen_bravo-eng
 add_lunch_combo cyanogen_espresso-eng
+add_lunch_combo cyanogen_supersonic-eng