diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index daac9826..83cd55a9 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -65,4 +65,5 @@ CHANGELOG
 * Incredible: Koush
 * Espresso (Slide): Wes Garner, Chris Soyars
 * Supersonic (EVO): Cyanogen, toastcfh
+* Galaxy S (Vibrant): Scepterr, Wes Garner
 
diff --git a/prebuilt/galaxys/media/bootanimation.zip b/prebuilt/galaxys/media/bootanimation.zip
new file mode 100644
index 00000000..355dc666
Binary files /dev/null and b/prebuilt/galaxys/media/bootanimation.zip differ
diff --git a/products/cyanogen_galaxys.mk b/products/cyanogen_galaxys.mk
new file mode 100644
index 00000000..8cc202e9
--- /dev/null
+++ b/products/cyanogen_galaxys.mk
@@ -0,0 +1,50 @@
+# Inherit device configuration for galaxys.
+$(call inherit-product, device/samsung/galaxys/full_galaxys.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_galaxys
+PRODUCT_BRAND := google
+PRODUCT_DEVICE := galaxys
+PRODUCT_MODEL := Vibrant
+PRODUCT_MANUFACTURER := 
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys
+PRIVATE_BUILD_DESC="passion-user 2.2 FRF91 43546 release-keys"
+
+# Extra Galaxy S overlay
+# No Overlay needed right now
+# PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxys
+
+PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/samsung/galaxys/kernel
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_smdkc110_defconfig
+
+# Enable Windows Media
+WITH_WINDOWS_MEDIA := true
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Vibrant
+else
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-6.0.0-Vibrant-alpha0
+endif
+
+#
+# Copy galaxys specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/galaxys/media/bootanimation.zip:system/media/bootanimation.zip