diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index d23b660..5b0fc72 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -24,8 +24,9 @@
 * Legend: Alexander Hofbauer
 * Vision (G2/Desire Z): Cyanogen
 * Geeksphone ONE: arcee
+* Geeksphone ZERO: arcee
 * Z71 (Boston, G1305, XT502, A60, Blaze, others): arcee
-* Wildfire: Jacob Crawley
+* Wildfire: Jacob Crawley, Arne Coucheron
 * NVidia Harmony: bekit
 * Ace (Desire HD): Kali-
 * Glacier (MT4G): Zinx, Kmobs
diff --git a/get-google-files b/get-google-files
index f0a575b..6158782 100755
--- a/get-google-files
+++ b/get-google-files
@@ -2,8 +2,8 @@
 import sys, random, urllib2, zipfile, StringIO, os
 from optparse import OptionParser
 
-FILENAME=["gapps-gb-20110307-signed.zip","gapps-gb-tegra-20110118-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110301-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
-VERSIONS=["gb","gb-tegra","hdpi","mdpi","mdpi-tiny","tegra","cm5hdpi","cm5mdpi","cm4"]
+FILENAME=["gapps-gb-20110307-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110301-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
+VERSIONS=["gb","hdpi","mdpi","mdpi-tiny","tegra","cm5hdpi","cm5mdpi","cm4"]
 MIRRORS=["http://goo-inside.me/gapps/","http://android.d3xt3r01.tk/cyanogen/gapps/","http://android.local.host.name/gapps/"]
 
 def device():
@@ -49,7 +49,7 @@
 def main():
     parser = OptionParser(usage="usage: %prog [options]")
     parser.add_option("-m", "--method", dest='method', default="download", help="Extraction Method: download")
-    parser.add_option("-v", "--version", dest='version', default="gb", help="GApps Version: gb, gb-tegra, hdpi, mdpi, mdpi-tiny, tegra, cm5hdpi, cm5mdpi, cm4 [default: gb]")
+    parser.add_option("-v", "--version", dest='version', default="gb", help="GApps Version: gb, hdpi, mdpi, mdpi-tiny, tegra, cm5hdpi, cm5mdpi, cm4 [default: gb]")
     (options, args) = parser.parse_args()
 
     if options.method == "device":
diff --git a/get-rommanager b/get-rommanager
index e94c473..a1258b2 100755
--- a/get-rommanager
+++ b/get-rommanager
@@ -1,2 +1,2 @@
 mkdir -p `dirname $0`/proprietary
-curl -o `dirname $0`/proprietary/RomManager.apk -O http://mirror1.kanged.net/recoveries/RomManager.apk
+curl -o `dirname $0`/proprietary/RomManager.apk -O http://mirror.kanged.net/recoveries/RomManager.apk
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 0000000..cf9a060
--- /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 0000000..0171a73
--- /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 0000000..e9e9e19
--- /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/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 6c41453..354926b 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -264,7 +264,7 @@
   <apn carrier="Tele2" mcc="240" mnc="07" apn="internet.tele2.se" mmsc="http://mmsc.tele2.se" mmsproxy="130.244.202.30" mmsport="8080" type="default,supl,mms" />
   <apn carrier="Telenor SE" mcc="240" mnc="08" apn="internet.telenor.se" type="default,supl" />
   <apn carrier="Telenor Mobilsurf" mcc="240" mnc="08" apn="services.telenor.se" proxy="172.30.253.241" port="8799" type="default,supl" />
-  <apn carrier="Telenor SE MMS" mcc="240" mnc="08" apn="services.telenor.se" mmsc="http://mss" mmsproxy="172.30.253.241" mmsport="8799" type="mms" />
+  <apn carrier="Telenor SE MMS" mcc="240" mnc="08" apn="services.telenor.se" mmsc="http://mms" mmsproxy="172.30.253.241" mmsport="8799" type="mms" />
   <apn carrier="TelenorMobilsurf" mcc="240" mnc="09" apn="services.telenor.se" proxy="173.30.253.241" port="8799" type="default,supl" />
   <apn carrier="Telenor MMS" mcc="240" mnc="09" apn="services.telenor.se" mmsc="http://mms" mmsproxy="173.30.253.241" mmsport="8799" type="mms" />
   <apn carrier="Spring data" mcc="240" mnc="10" apn="data.springmobil.se" type="default,supl" />
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 0c905d5..4bcfa19 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -21,7 +21,9 @@
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
+    $(LOCAL_DIR)/cyanogen_speedy.mk \
     $(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_zero.mk
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index 1d4fed1..28b6957 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -28,6 +28,9 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
+# Add AicBootFix for ace battery fix
+PRODUCT_PACKAGES += AicBootFix
+
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index 7189065..d00d514 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -39,9 +39,9 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC2.1-click
+            ro.modversion=CyanogenMod-7.0.0-RC2.2-click
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-RC2.1-click-KANG
+            ro.modversion=CyanogenMod-RC2.2-click-KANG
     endif
 endif
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
new file mode 100644
index 0000000..84e3710
--- /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=sprint/htc_speedy/speedy/speedy:2.2/FRF91/291627:user/release-keys PRIVATE_BUILD_DESC="1.17.651.1 CL291627 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/products/cyanogen_zero.mk b/products/cyanogen_zero.mk
new file mode 100644
index 0000000..c7f49ec
--- /dev/null
+++ b/products/cyanogen_zero.mk
@@ -0,0 +1,41 @@
+# Inherit AOSP device configuration for zero.
+$(call inherit-product, device/geeksphone/zero/zero.mk)
+
+# 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_zero
+PRODUCT_BRAND := geeksphone
+PRODUCT_DEVICE := zero
+PRODUCT_MODEL := Geeksphone ZERO
+PRODUCT_MANUFACTURER := Geeksphone
+
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=geeksphone_zero BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-ZERO
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC2-ZERO
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC2-ZERO-KANG
+    endif
+endif
+
+#
+# Copy legend 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 73e4f9b..44ef373 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -20,10 +20,11 @@
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_sholes-eng
+add_lunch_combo cyanogen_speedy-eng
 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_zero-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH