diff --git a/prebuilt/espresso/media/bootanimation.zip b/prebuilt/espresso/media/bootanimation.zip
new file mode 100644
index 00000000..3afbfb74
Binary files /dev/null and b/prebuilt/espresso/media/bootanimation.zip differ
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 9cfa3d5f..5a47ab54 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -5,4 +5,5 @@ PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/cyanogen_sholes.mk \
 	$(LOCAL_DIR)/cyanogen_dream.mk \
 	$(LOCAL_DIR)/cyanogen_sapphire.mk \
-	$(LOCAL_DIR)/cyanogen_bravo.mk
+	$(LOCAL_DIR)/cyanogen_bravo.mk \
+	$(LOCAL_DIR)/cyanogen_espresso.mk
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
new file mode 100644
index 00000000..2d2373f0
--- /dev/null
+++ b/products/cyanogen_espresso.mk
@@ -0,0 +1,33 @@
+# Inherit AOSP device configuration for espresso.
+$(call inherit-product, device/htc/espresso/full_espresso.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_espresso
+PRODUCT_BRAND := htc
+PRODUCT_DEVICE := espresso
+PRODUCT_MODEL := myTouch 3G Slide
+PRODUCT_MANUFACTURER := T-Mobile
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF85B BUILD_DISPLAY_ID=FRF85B PRODUCT_NAME=espresso BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF85B/42745:user/release-keys
+PRIVATE_BUILD_DESC="espresso-user 2.2  42745 release-keys"
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.0.0-Slide-alpha0
+endif
+
+#
+# Copy espresso specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/espresso/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 1447c059..75f42793 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -5,3 +5,4 @@ add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_dream-eng
 add_lunch_combo cyanogen_sapphire-eng
 add_lunch_combo cyanogen_bravo-eng
+add_lunch_combo cyanogen_espresso-eng