diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index ada2036..329b801 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -12,4 +12,5 @@
     $(LOCAL_DIR)/cyanogen_liberty.mk \
     $(LOCAL_DIR)/cyanogen_vibrant.mk \
     $(LOCAL_DIR)/cyanogen_legend.mk \
-    $(LOCAL_DIR)/cyanogen_vision.mk
+    $(LOCAL_DIR)/cyanogen_vision.mk \
+    $(LOCAL_DIR)/cyanogen_one.mk
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
new file mode 100644
index 0000000..2a0505d
--- /dev/null
+++ b/products/cyanogen_one.mk
@@ -0,0 +1,44 @@
+# Inherit AOSP device configuration for geeksphone one.
+$(call inherit-product, device/geeksphone/one/one.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_one
+PRODUCT_BRAND := geeksphone
+PRODUCT_DEVICE := one
+TARGET_OTA_ASSERT_DEVICE := geeksphone-one
+PRODUCT_MODEL := Geeksphone ONE
+PRODUCT_MANUFACTURER := Geeksphone
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
+
+#
+# Move dalvik cache to data partition where there is more room to solve startup problems
+#
+PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
+
+#
+# Set ro.modversion
+#
+
+
+
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-ONE
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.1.0-RC1-ONE
+endif
+
+#
+# Copy GPO specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 03d81e9..e7f9613 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -12,5 +12,6 @@
 add_lunch_combo cyanogen_vibrant-eng
 add_lunch_combo cyanogen_legend-eng
 add_lunch_combo cyanogen_vision-eng
+add_lunch_combo cyanogen_one-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH