diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index b398da6..37223ef 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -203,6 +203,8 @@
   <apn carrier="Carrefour Mova MMS" mcc="260" mnc="01" apn="mms.mova.pl" mmsc="http://mms.mova.pl:8002/" mmsproxy="212.002.096.016" mmsport="8080" type="mms" />
   <apn carrier="CBW Internet" apn="wap.gocbw.com" proxy="216.68.79.202" port="80" user="cbw" password="" server="" mmsc="" mmsport="" mcc="310" mnc="420" type="default" />
   <apn carrier="CBW MMS" apn="wap.gocbw.com" proxy="" port="" user="" password="" server="" mmsc="http://mms.gocbw.com:8088/mms" mmsproxy="216.68.79.202" mmsport="80" mcc="310" mnc="420" authenticationtype="PAP" type="mms" />
+  <apn carrier="CDMA" mcc="310" mnc="120" apn="0" port="" mmsproxy="" mmsport="" mmsc="" type="*"/>
+  <apn carrier="CDMA" mcc="310" mnc="120" apn="1" port="" mmsproxy="" mmsport="" mmsc="http://mms.sprintpcs.com" />
   <apn carrier="Celcom" mcc="502" mnc="13" apn="celcom3g" user="" server="" password="" mmsc="" type="default"/>
   <apn carrier="Celcom MMS" mcc="502" mnc="13" apn="celcom3g" user="mms" server="" password="mms" mmsc="http://mms.celcom.net.my" mmsproxy="10.128.1.242" mmsport="8080" type="mms"/>
   <apn carrier="CellCOM" mcc="425" mnc="02" apn="internetg" user="" server="" password="" mmsc="" type="default"/>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 92a17a3..435b625 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -2,6 +2,7 @@
     $(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_bravo.mk \
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
new file mode 100644
index 0000000..e325f0f
--- /dev/null
+++ b/products/cyanogen_heroc.mk
@@ -0,0 +1,43 @@
+# Inherit AOSP device configuration for heroc.
+$(call inherit-product, device/htc/heroc/heroc.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# Inherit apns list from common 
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_heroc
+PRODUCT_BRAND := sprint
+PRODUCT_DEVICE := heroc
+PRODUCT_MODEL := HERO200
+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="heroc-user 2.2 FRF91 43546 release-keys"
+
+# Use Prebuilt kernel from heroC device tree
+PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/heroc/kernel
+
+# Extra overlay for Gallery3D orientation hack
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.0.0-Heroc-RC0
+endif
+
+#
+# Copy dream/sapphire specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/dream_sapphire/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 05bcb78..ef4bb4e 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,6 +1,7 @@
 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_bravo-eng