diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 0b65b4bf..f9c0c45e 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -45,6 +45,7 @@ Maintainers:
 * Incredible S: Kali-, attn1
 * Jordan (Defy): Quarx, Epsylon3, maniac103
 * Droid2 (MotoA955): JBirdVegas, RevNumbers
+* Galaxy S II (GT-I9100): atinm, codeworkx, coolya, GuiperPT, Unhelpful
 
 Translators:
 ------------
diff --git a/overlay/galaxys2/frameworks/base/core/res/res/values/config.xml b/overlay/galaxys2/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 00000000..bfd07ca0
--- /dev/null
+++ b/overlay/galaxys2/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source 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/galaxys2/packages/apps/CMParts/res/values/config.xml b/overlay/galaxys2/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 00000000..0171a738
--- /dev/null
+++ b/overlay/galaxys2/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/products/AndroidProducts.mk b/products/AndroidProducts.mk
index fcb05491..ed7f0cf2 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -18,6 +18,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_heroc.mk \
     $(LOCAL_DIR)/cyanogen_inc.mk \
     $(LOCAL_DIR)/cyanogen_jordan.mk \
+    $(LOCAL_DIR)/cyanogen_galaxys2.mk \
     $(LOCAL_DIR)/cyanogen_galaxysmtd.mk \
     $(LOCAL_DIR)/cyanogen_generic.mk \
     $(LOCAL_DIR)/cyanogen_glacier.mk \
diff --git a/products/cyanogen_galaxys2.mk b/products/cyanogen_galaxys2.mk
new file mode 100644
index 00000000..2a6c0cce
--- /dev/null
+++ b/products/cyanogen_galaxys2.mk
@@ -0,0 +1,58 @@
+# Inherit AOSP device configuration for galaxys2.
+$(call inherit-product, device/samsung/galaxys2/full_galaxys2.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_galaxys2
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := galaxys2
+PRODUCT_MODEL := GT-I9100
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:2.3.3/GINGERBREAD/XWKE7:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 2.3.3 GINGERBREAD XWKE7 release-keys"
+
+# Extra captivate overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxys2
+
+# Add FM and Torch Apps
+PRODUCT_PACKAGES += \
+    Torch \
+    FM
+
+# 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
+
+# Add additional mounts
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.additionalmounts=/mnt/sdcard/external_sd
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-GalaxyS2
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-GalaxyS2
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-GalaxyS2-KANG
+    endif
+endif
+
+#
+# Copy captivate 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 8947dfee..d9df7ea4 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -13,6 +13,7 @@ add_lunch_combo cyanogen_droid2-eng
 add_lunch_combo cyanogen_encore-eng
 add_lunch_combo cyanogen_espresso-eng
 add_lunch_combo cyanogen_fascinatemtd-eng
+add_lunch_combo cyanogen_galaxys2-eng
 add_lunch_combo cyanogen_galaxysmtd-eng
 add_lunch_combo cyanogen_generic-eng
 add_lunch_combo cyanogen_glacier-eng