diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 5a009189..33376543 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -44,6 +44,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_robyn.mk \
     $(LOCAL_DIR)/cyanogen_saga.mk \
+    $(LOCAL_DIR)/cyanogen_satsuma.mk \
     $(LOCAL_DIR)/cyanogen_shadow.mk \
     $(LOCAL_DIR)/cyanogen_shakira.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
diff --git a/products/cyanogen_satsuma.mk b/products/cyanogen_satsuma.mk
new file mode 100644
index 00000000..25c06c78
--- /dev/null
+++ b/products/cyanogen_satsuma.mk
@@ -0,0 +1,55 @@
+# Inherit device configuration for satsuma.
+$(call inherit-product, device/semc/satsuma/device_satsuma.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_satsuma
+PRODUCT_BRAND := SEMC
+PRODUCT_DEVICE := satsuma
+PRODUCT_MODEL := ST17i
+PRODUCT_MANUFACTURER := Sony Ericsson
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST17i BUILD_ID=4.0.1.A.0.284 BUILD_DISPLAY_ID=4.0.1.A.0.284 BUILD_FINGERPRINT=SEMC/ST17i_1255-0788/ST17i:2.3.4/4.0.1.A.0.284/4_733w:user/release-keys PRIVATE_BUILD_DESC="ST17i-user 2.3.4 4.0.1.A.0.284 4_733w test-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_satsuma_defconfig
+
+# Extra satsuma overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/satsuma
+
+# Add the Torch app
+#PRODUCT_PACKAGES += Torch
+
+
+# BCM 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-XperiaMini-ST15i
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-XperiaMini-ST15i
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-XperiaMini-ST15i-KANG
+    endif
+endif
+
+#
+# Copy passion 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 0ce1cdad..6e933ae3 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -43,6 +43,7 @@ add_lunch_combo cyanogen_p999-eng
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_robyn-eng
 add_lunch_combo cyanogen_saga-eng
+add_lunch_combo cyanogen_satsuma-eng
 add_lunch_combo cyanogen_shadow-eng
 add_lunch_combo cyanogen_shakira-eng
 add_lunch_combo cyanogen_sholes-eng