diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_green.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_green.png
new file mode 100644
index 0000000..a04c5c4
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_green.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png
new file mode 100644
index 0000000..c58c68d
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png
new file mode 100644
index 0000000..c2f7c5d
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_red.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_red.png
new file mode 100644
index 0000000..e77bb18
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_red.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png
new file mode 100644
index 0000000..c20c1f4
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left.png
new file mode 100644
index 0000000..8306273
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png
new file mode 100644
index 0000000..f925053
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_right.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_right.png
new file mode 100644
index 0000000..e23327d
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_right.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg.png
new file mode 100644
index 0000000..a3290a6
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev.png
new file mode 100644
index 0000000..a4f7431
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev_down.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev_down.png
new file mode 100644
index 0000000..cfd10d2
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev_down.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/lense_square_bg.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/lense_square_bg.png
new file mode 100644
index 0000000..2e109c0
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/lense_square_bg.png
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/values/config.xml b/overlay/olympus/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..960a389
--- /dev/null
+++ b/overlay/olympus/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
+         specified -->
+    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+
+</resources>
diff --git a/overlay/olympus/packages/apps/CMParts/res/values/config.xml b/overlay/olympus/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..f49f9fc
--- /dev/null
+++ b/overlay/olympus/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_rgb_notification_led">true</bool>
+    <bool name="has_camera_button">false</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/olympus/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml b/overlay/olympus/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
new file mode 100644
index 0000000..97e674e
--- /dev/null
+++ b/overlay/olympus/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<resources>
+    <!-- key_height + key_bottom_gap = popup_key_height -->
+    <dimen name="key_height">0.300in</dimen>
+    <dimen name="key_bottom_gap">0.040in</dimen>
+    <dimen name="popup_key_height">0.340in</dimen>
+    <dimen name="keyboard_bottom_padding">0.0in</dimen>
+    <dimen name="candidate_strip_height">38dip</dimen>
+    <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
+    <dimen name="spacebar_vertical_correction">2dip</dimen>
+    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+    <!-- popup_key_height x 1.7 -->
+    <dimen name="mini_keyboard_slide_allowance">0.459in</dimen>
+    <!-- popup_key_height x 1.0 -->
+    <dimen name="mini_keyboard_vertical_correction">-0.270in</dimen>
+</resources>
diff --git a/overlay/olympus/packages/inputmethods/LatinIME/java/res/values/dimens.xml b/overlay/olympus/packages/inputmethods/LatinIME/java/res/values/dimens.xml
new file mode 100644
index 0000000..319de14
--- /dev/null
+++ b/overlay/olympus/packages/inputmethods/LatinIME/java/res/values/dimens.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<resources>
+    <!-- key_height + key_bottom_gap = popup_key_height -->
+    <dimen name="key_height">0.300in</dimen>
+    <dimen name="key_bottom_gap">0.040in</dimen>
+    <dimen name="popup_key_height">0.340in</dimen>
+    <dimen name="keyboard_bottom_padding">0.06in</dimen>
+    <dimen name="bubble_pointer_offset">22dip</dimen>
+    <dimen name="candidate_strip_height">42dip</dimen>
+    <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
+    <dimen name="spacebar_vertical_correction">4dip</dimen>
+    <!-- If the screen height in landscape is larger than the below value, then the keyboard
+         will not go into extract (fullscreen) mode. -->
+    <dimen name="max_height_for_fullscreen">2.8in</dimen>
+    <dimen name="key_text_size">0.13in</dimen>
+    <dimen name="key_label_text_size">0.083in</dimen>
+    <dimen name="key_preview_text_size_large">40sp</dimen>
+    <dimen name="key_preview_offset">0.000in</dimen>
+    <!-- key_preview_text_size_large x 2 -->
+    <dimen name="key_preview_height">80sp</dimen>
+    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
+    <!-- popup_key_height x 1.7 -->
+    <dimen name="mini_keyboard_slide_allowance">0.553in</dimen>
+    <!-- popup_key_height x 1.0 -->
+    <dimen name="mini_keyboard_vertical_correction">-0.325in</dimen>
+    <dimen name="key_hysteresis_distance">0.05in</dimen>
+    <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
+         to user's finger. -->
+    <dimen name="keyboard_vertical_correction">-0.05in</dimen>
+    <dimen name="candidate_min_touchable_width">0.3in</dimen>
+</resources>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 36c2833..aaa042c 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -37,6 +37,7 @@
     $(LOCAL_DIR)/cyanogen_morrison.mk \
     $(LOCAL_DIR)/cyanogen_motus.mk \
     $(LOCAL_DIR)/cyanogen_one.mk \
+    $(LOCAL_DIR)/cyanogen_olympus.mk \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
diff --git a/products/cyanogen_olympus.mk b/products/cyanogen_olympus.mk
new file mode 100644
index 0000000..32cfe30
--- /dev/null
+++ b/products/cyanogen_olympus.mk
@@ -0,0 +1,45 @@
+# Inherit device configuration for olympus.
+$(call inherit-product, device/motorola/olympus/olympus.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_olympus
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := olympus
+PRODUCT_MODEL := MB860
+PRODUCT_MANUFACTURER := Motorola
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_BRAND=MOTO PRODUCT_NAME=olyatt BUILD_ID=4.5.91 BUILD_PRODUCT=olyatt BUILD_DISPLAY_ID=4.5.91 BUILD_FINGERPRINT=MOTO/olyatt/olympus:2.3.4/4.5.91/110625:user/release-keys PRIVATE_BUILD_DESC="olympus-user 2.3.4 4.5.91 110625 release-keys"
+
+# Extra Olympus overlay
+PRODUCT_PACKAGE_OVERLAYS += \
+	vendor/cyanogen/overlay/olympus \
+#	vendor/cyanogen/overlay/qhd
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Olympus
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-Olympus
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-Olympus-KANG
+    endif
+endif
+
+#
+# Copy hdpi 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 cfd2a16..f48d976 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -36,6 +36,7 @@
 add_lunch_combo cyanogen_morrison-eng
 add_lunch_combo cyanogen_motus-eng
 add_lunch_combo cyanogen_one-eng
+add_lunch_combo cyanogen_olympus-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng
 add_lunch_combo cyanogen_passion-eng