diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 91d7300..02b547f 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -30,6 +30,7 @@
     $(LOCAL_DIR)/cyanogen_sholes.mk \
     $(LOCAL_DIR)/cyanogen_speedy.mk \
     $(LOCAL_DIR)/cyanogen_supersonic.mk \
+    $(LOCAL_DIR)/cyanogen_u8220.mk \
     $(LOCAL_DIR)/cyanogen_vega.mk \
     $(LOCAL_DIR)/cyanogen_vibrantmtd.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
diff --git a/products/cyanogen_crespo4g.mk b/products/cyanogen_crespo4g.mk
index aa48e3e..3edd46d 100644
--- a/products/cyanogen_crespo4g.mk
+++ b/products/cyanogen_crespo4g.mk
@@ -4,16 +4,13 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
 #
 # Setup device specific product configuration.
 #
 PRODUCT_NAME := cyanogen_crespo4g
 PRODUCT_BRAND := google
 PRODUCT_DEVICE := crespo4g
-PRODUCT_MODEL := Nexus S
+PRODUCT_MODEL := Nexus S 4G
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
 
@@ -23,12 +20,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# 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
-
 #
 # Set ro.modversion
 #
diff --git a/products/cyanogen_u8220.mk b/products/cyanogen_u8220.mk
new file mode 100644
index 0000000..8a86b5a
--- /dev/null
+++ b/products/cyanogen_u8220.mk
@@ -0,0 +1,41 @@
+# Inherit AOSP device configuration for dream_sapphire.
+$(call inherit-product, device/huawei/u8220/device_u8220.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# Include GSM-only stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_u8220
+PRODUCT_BRAND := huawei
+PRODUCT_DEVICE := u8220
+PRODUCT_MODEL := U8220/U8230
+PRODUCT_MANUFACTURER := Huawei
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-U8220
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-U8220
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-U8220-KANG
+    endif
+endif
+
+
+#
+# Copy DS specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index eadee4a..acfb602 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -29,6 +29,7 @@
 add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_speedy-eng
 add_lunch_combo cyanogen_supersonic-eng
+add_lunch_combo cyanogen_u8220-eng
 add_lunch_combo cyanogen_vega-eng
 add_lunch_combo cyanogen_vibrantmtd-eng
 add_lunch_combo cyanogen_vision-eng