diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 28e21bbe..9cfa3d5f 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -4,4 +4,5 @@ PRODUCT_MAKEFILES := \
         $(LOCAL_DIR)/cyanogen_heroc.mk \
         $(LOCAL_DIR)/cyanogen_sholes.mk \
 	$(LOCAL_DIR)/cyanogen_dream.mk \
-	$(LOCAL_DIR)/cyanogen_sapphire.mk
+	$(LOCAL_DIR)/cyanogen_sapphire.mk \
+	$(LOCAL_DIR)/cyanogen_bravo.mk
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
new file mode 100644
index 00000000..92c7878e
--- /dev/null
+++ b/products/cyanogen_bravo.mk
@@ -0,0 +1,36 @@
+# Inherit AOSP device configuration for passion.
+$(call inherit-product, device/htc/passion/full_bravo.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_bravo
+PRODUCT_BRAND := htc_wwe
+PRODUCT_DEVICE := bravo
+PRODUCT_MODEL := HTC Desire
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF85B BUILD_DISPLAY_ID=FRF85B PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF85B/42745:user/release-keys TARGET_BUILD_TYPE=userdebug
+PRIVATE_BUILD_DESC="passion-user 2.2 FRF85B 42745 release-keys"
+
+# Extra Passion overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Bravo
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.0.0-Bravo-test0
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/bravo/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 6c23052c..1447c059 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -4,3 +4,4 @@ add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_sholes-eng
 add_lunch_combo cyanogen_dream-eng
 add_lunch_combo cyanogen_sapphire-eng
+add_lunch_combo cyanogen_bravo-eng