diff --git a/prebuilt/heroc/etc/apns-conf.xml b/prebuilt/heroc/etc/apns-conf.xml
new file mode 100644
index 00000000..4bcc9fc2
--- /dev/null
+++ b/prebuilt/heroc/etc/apns-conf.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+    apn carrier="CDMA"
+         mcc="310"
+         mnc="120"
+         apn="0"
+         port=""
+         mmsproxy=""
+         mmsport=""
+         mmsc=""
+         type="*"
+
+-->
+
+<!-- use empty string to specify no proxy or port -->
+<!-- This version must agree with that in apps/common/res/apns.xml -->
+<apns version="6">
+    <apn carrier="CDMA"
+         mcc="310"
+         mnc="120"
+         apn="1"
+         port=""
+         mmsproxy=""
+         mmsport=""
+         mmsc="http://mms.sprintpcs.com"
+    />
+</apns>
diff --git a/prebuilt/heroc/etc/gps.conf b/prebuilt/heroc/etc/gps.conf
new file mode 100644
index 00000000..f371e67e
--- /dev/null
+++ b/prebuilt/heroc/etc/gps.conf
@@ -0,0 +1,5 @@
+NTP_SERVER=north-america.pool.ntp.org
+XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
+XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
+XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
+QOS_ACCURACY=16
diff --git a/prebuilt/heroc/media/bootanimation.zip b/prebuilt/heroc/media/bootanimation.zip
new file mode 100644
index 00000000..3afbfb74
Binary files /dev/null and b/prebuilt/heroc/media/bootanimation.zip differ
diff --git a/product/cyanogen_heroc.mk b/product/cyanogen_heroc.mk
new file mode 100644
index 00000000..b8e59cf1
--- /dev/null
+++ b/product/cyanogen_heroc.mk
@@ -0,0 +1,35 @@
+# Inherit AOSP device configuration for passion.
+$(call inherit-product, device/htc/heroc/froyo_heroc.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/product/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_heroc
+PRODUCT_BRAND := htc
+PRODUCT_DEVICE := heroc
+PRODUCT_MODEL := Hero CDMA
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=passion BUILD_FINGERPRINT=/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys
+PRIVATE_BUILD_DESC="passion-user 2.2 FRF83 42295 release-keys"
+
+#
+# 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-Heroc-test0
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/heroc/media/bootanimation.zip:system/media/bootanimation.zip\
+    vendor/cyanogen/prebuilt/heroc/etc/apns-conf.xml:system/etc/apns-conf.xml \
+    vendor/cyanogen/prebuilt/heroc/etc/gps.conf:system/etc/gps.conf 
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 27005a09..7ba1cafe 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -1,3 +1,4 @@
 PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/cyanogen_passion.mk \
         $(LOCAL_DIR)/cyanogen_incredible.mk \
+        $(LOCAL_DIR)/cyanogen_heroc.mk \
diff --git a/vendorsetup.sh b/vendorsetup.sh
index e0694de4..f8f9c1fc 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -2,3 +2,5 @@ add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_passion-userdebug
 add_lunch_combo cyanogen_incredible-eng
 add_lunch_combo cyanogen_incredible-userdebug
+add_lunch_combo cyanogen_heroc-eng
+add_lunch_combo cyanogen_heroc-userdebug