diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 37453fe..28331d0 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -52,6 +52,7 @@
 * Xperia Play (R800i): Bin4ry,defer,jerpelea (FreeXperia team)
 * Droid2we (Droid2 Global): RevNumbers, x13thangelx
 * V9 (ZTE Light, Optus MyTab, others): kallt_kaffe and Tom Giordano
+* Motus (Backflip) : j_r0dd, flavio_frow
 
 Translators:
 ------------
diff --git a/overlay/motus/packages/apps/CMParts/res/values/config.xml b/overlay/motus/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..0c5ac3b
--- /dev/null
+++ b/overlay/motus/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,11 @@
+<?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_camera_button">true</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+    <bool name="has_led_flash">true</bool>
+    <bool name="has_backtrack_minipad">true</bool>
+    <bool name="has_envelope_key">true</bool>
+    <bool name="has_explorer_key">true</bool>
+</resources>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 2f3ac39..267121d 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -31,6 +31,7 @@
     $(LOCAL_DIR)/cyanogen_mecha.mk \
     $(LOCAL_DIR)/cyanogen_mesmerizemtd.mk \
     $(LOCAL_DIR)/cyanogen_morrison.mk \
+    $(LOCAL_DIR)/cyanogen_motus.mk \
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
diff --git a/products/cyanogen_motus.mk b/products/cyanogen_motus.mk
new file mode 100644
index 0000000..deb0bf8
--- /dev/null
+++ b/products/cyanogen_motus.mk
@@ -0,0 +1,39 @@
+# Inherit AOSP device configuration for motus.
+$(call inherit-product, device/motorola/motus/motus.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_motus
+PRODUCT_BRAND := motus
+PRODUCT_DEVICE := motus
+PRODUCT_MODEL := MB300
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-BACKFLIP
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-BACKFLIP
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-BACKFLIP-KANG
+    endif
+endif
+
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=motus_att_us TARGET_DEVICE=motus BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
+
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/motus
diff --git a/vendorsetup.sh b/vendorsetup.sh
index d1ae0b7..95fd2cd 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -30,6 +30,7 @@
 add_lunch_combo cyanogen_mecha-eng
 add_lunch_combo cyanogen_mesmerizemtd-eng
 add_lunch_combo cyanogen_morrison-eng
+add_lunch_combo cyanogen_motus-eng
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng