diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 85e6070..e9c0d00 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -40,6 +40,7 @@
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_saga.mk \
     $(LOCAL_DIR)/cyanogen_shadow.mk \
+    $(LOCAL_DIR)/cyanogen_shakira.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
     $(LOCAL_DIR)/cyanogen_showcasemtd.mk \
     $(LOCAL_DIR)/cyanogen_smb_a1002.mk \
diff --git a/products/cyanogen_shakira.mk b/products/cyanogen_shakira.mk
new file mode 100644
index 0000000..11ff00a
--- /dev/null
+++ b/products/cyanogen_shakira.mk
@@ -0,0 +1,46 @@
+# Inherit device configuration for ace.
+$(call inherit-product, device/semc/shakira/device_shakira.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_shakira
+PRODUCT_BRAND := SEMC
+PRODUCT_DEVICE := shakira
+PRODUCT_MODEL := E15i
+PRODUCT_MANUFACTURER := Sony Ericsson
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E15i PRODUCT_NAME=E15i BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
+
+# Extra shakira overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/shakira
+
+# Ti FM radio (not implemeted in libaudio)
+#$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-X8
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-X8
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-X8-KANG
+    endif
+endif
+
+#
+# Copy MDPI 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 9f5a2a6..1c6d32e 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -39,6 +39,7 @@
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_saga-eng
 add_lunch_combo cyanogen_shadow-eng
+add_lunch_combo cyanogen_shakira-eng
 add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_showcasemtd-eng
 add_lunch_combo cyanogen_smb_a1002-eng