diff --git a/overlay/jordan/packages/apps/CMParts/res/values/config.xml b/overlay/jordan/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..0b1ad2e
--- /dev/null
+++ b/overlay/jordan/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_camera_button">false</bool>
+    <bool name="has_rgb_notification_led">true</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 8315397..8ef2b35 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -16,6 +16,7 @@
     $(LOCAL_DIR)/cyanogen_hero.mk \
     $(LOCAL_DIR)/cyanogen_heroc.mk \
     $(LOCAL_DIR)/cyanogen_inc.mk \
+    $(LOCAL_DIR)/cyanogen_jordan.mk \
     $(LOCAL_DIR)/cyanogen_galaxysmtd.mk \
     $(LOCAL_DIR)/cyanogen_generic.mk \
     $(LOCAL_DIR)/cyanogen_glacier.mk \
diff --git a/products/cyanogen_jordan.mk b/products/cyanogen_jordan.mk
new file mode 100644
index 0000000..1a2ec3d
--- /dev/null
+++ b/products/cyanogen_jordan.mk
@@ -0,0 +1,65 @@
+# Inherit AOSP device configuration for passion.
+$(call inherit-product, device/motorola/jordan/jordan.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_jordan
+PRODUCT_BRAND := MOTO
+PRODUCT_DEVICE := jordan
+PRODUCT_MODEL := MB525
+PRODUCT_MANUFACTURER := motorola
+PRODUCT_SBF := 3.4.2-179
+PRODUCT_SFX := RTGB
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%y%m%d-%H%M)-NIGHTLY-Jordan
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-jordan
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC1-jordan
+    endif
+endif
+
+UTC_DATE := $(shell date +%s)
+DATE     := $(shell date +%Y%m%d)
+
+PRODUCT_BUILD_PROP_OVERRIDES := \
+BUILD_ID=GRJ22 \
+BUILD_DISPLAY_ID="Gingerbread GRJ22" \
+PRODUCT_NAME=${PRODUCT_MODEL}_${PRODUCT_SFX} \
+TARGET_DEVICE=umts_jordan \
+BUILD_FINGERPRINT=MOTO/${PRODUCT_MODEL}_${PRODUCT_SFX}/umts_jordan/jordan:2.3.4/${PRODUCT_SBF}/${UTC_DATE}:user/release-keys \
+PRODUCT_BRAND=MOTO \
+PRIVATE_BUILD_DESC="umts_jordan-user 2.3.4 ${PRODUCT_SBF} ${UTC_DATE} release-keys" \
+BUILD_NUMBER=${DATE} \
+BUILD_VERSION_TAGS=release-keys \
+TARGET_BUILD_TYPE=user \
+USER=CyanogenDefy
+
+PRODUCT_COPY_FILES += \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+PRODUCT_PACKAGE_OVERLAYS += \
+    vendor/cyanogen/overlay/jordan
+
+# Add the Torch app
+PRODUCT_PACKAGES += \
+    Torch
+
+# for custom apns-conf.xml
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+# TI FM radio
+$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 63ab528..c2fcd65 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -18,6 +18,7 @@
 add_lunch_combo cyanogen_hero-eng
 add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_inc-eng
+add_lunch_combo cyanogen_jordan-eng
 add_lunch_combo cyanogen_legend-eng
 add_lunch_combo cyanogen_leo-eng
 add_lunch_combo cyanogen_liberty-eng