diff --git a/overlay/speedy/frameworks/base/core/res/res/values/config.xml b/overlay/speedy/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 00000000..cf9a0603
--- /dev/null
+++ b/overlay/speedy/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The CyanogenMod Project
+**
+** 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.
+*/
+-->
+<resources>
+
+    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
+         specified -->
+    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+
+</resources>
diff --git a/overlay/speedy/packages/apps/CMParts/res/values/config.xml b/overlay/speedy/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 00000000..0171a738
--- /dev/null
+++ b/overlay/speedy/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">false</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+    <bool name="has_camera_button">false</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/speedy/packages/apps/Camera/res/values/config.xml b/overlay/speedy/packages/apps/Camera/res/values/config.xml
new file mode 100644
index 00000000..e9e9e19a
--- /dev/null
+++ b/overlay/speedy/packages/apps/Camera/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The CyanogenMod Project
+**
+** 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+	<string name="filtered_pictureSizes">2592x1936</string>
+</resources>
+
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 0c905d53..ce1b2268 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -24,4 +24,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_supersonic.mk \
     $(LOCAL_DIR)/cyanogen_vega.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_z71.mk
+    $(LOCAL_DIR)/cyanogen_z71.mk \
+    $(LOCAL_DIR)/cyanogen_speedy.mk
+
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
new file mode 100644
index 00000000..b4159afb
--- /dev/null
+++ b/products/cyanogen_speedy.mk
@@ -0,0 +1,51 @@
+# Inherit AOSP device configuration for speedy.
+$(call inherit-product, device/htc/speedy/speedy.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_speedy
+PRODUCT_BRAND := sprint
+PRODUCT_DEVICE := speedy
+PRODUCT_MODEL := PG06100
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=htc_speedy BUILD_FINGERPRINT=tmobile/htc_vision/vision/vision:2.2/FRF91/277427:user/release-keys PRIVATE_BUILD_DESC="3.29.651.5 CL252548 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_speedy_defconfig
+
+# Extra Supersonic overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/speedy
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Speedy
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC1-Speedy
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC1-Speedy-KANG
+    endif
+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 73e4f9ba..0e4fd2ed 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -24,6 +24,7 @@ add_lunch_combo cyanogen_supersonic-eng
 add_lunch_combo cyanogen_vega-eng
 add_lunch_combo cyanogen_vision-eng
 add_lunch_combo cyanogen_z71-eng
+add_lunch_combo cyanogen_speedy-eng
 
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH