diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 28331d02..8395d71c 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -53,6 +53,7 @@ Maintainers:
 * Droid2we (Droid2 Global): RevNumbers, x13thangelx
 * V9 (ZTE Light, Optus MyTab, others): kallt_kaffe and Tom Giordano
 * Motus (Backflip) : j_r0dd, flavio_frow
+* Saga (Desire S): Nexx, SuperKid
 
 Translators:
 ------------
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 267121db..84165624 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -36,6 +36,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
+    $(LOCAL_DIR)/cyanogen_saga.mk \
     $(LOCAL_DIR)/cyanogen_shadow.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
     $(LOCAL_DIR)/cyanogen_showcasemtd.mk \
diff --git a/products/cyanogen_saga.mk b/products/cyanogen_saga.mk
new file mode 100644
index 00000000..79391ab1
--- /dev/null
+++ b/products/cyanogen_saga.mk
@@ -0,0 +1,57 @@
+# Inherit device configuration for saga.
+$(call inherit-product, device/htc/saga/saga.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_saga
+PRODUCT_BRAND := htc_europe
+PRODUCT_DEVICE := saga
+PRODUCT_MODEL := HTC Desire S
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_saga BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=htc_europe/htc_saga/saga:2.3.3/GRI40/78999:user/release-keys PRIVATE_BUILD_DESC="1.47.401.4 CL78999 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_saga_defconfig
+
+# Extra saga overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/saga
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Add AicBootFix for saga battery fix
+PRODUCT_PACKAGES += AicBootFix
+
+# 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-DesireS
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-DesireS
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-DesireS-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 95fd2cd8..c9bf75cd 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -35,6 +35,7 @@ add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng
 add_lunch_combo cyanogen_passion-eng
+add_lunch_combo cyanogen_saga-eng
 add_lunch_combo cyanogen_shadow-eng
 add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_showcasemtd-eng