diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 88f1f87..cfc2542 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -25,6 +25,7 @@
 CHANGELOG
 ---------
 ### 6.1.0
+* Common: Update to Android 2.2.1
 * Common: ADWLauncher 1.1.5 - Ander Webbs
 * Common: Configurable audio focus for music app - Jonas Larsson
 * Common: APN cleanup (fixes many issues with GPS and MMS) - Cyanogen
@@ -43,6 +44,11 @@
 * Common: Control locking of MMS app in memory - Julian J. M
 * Common: Kill foreground app by long-pressing back - Evan Charlton
 * Common: New AppWidgetPicker dialog - boombuler@XDA
+* Common: FileManager app - OpenIntents
+* Common: Anonymous install statistics gathering - Chris Soyars
+* Common: Stable shot camera mode - Cyanogen
+* Common: Dual-mode snooze (long press dismiss) - Evan Charlton
+* N1/DS/Hero - Slightly better Gallery3D orientation fix - Jonas Larsson 
 * N1/DS - Kernel 2.6.35 based on Pershoot's repository
 * Supersonic - Kernel 2.6.34 courtesy of Toast and Madcoder
 * Bravo: Kernel 2.6.35
diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk
index 0b760d5..a8cba4d 100644
--- a/products/cyanogen_vibrant.mk
+++ b/products/cyanogen_vibrant.mk
@@ -12,10 +12,10 @@
 #
 PRODUCT_NAME := cyanogen_vibrant
 PRODUCT_BRAND := Samsung
-PRODUCT_DEVICE := vibrant
+PRODUCT_DEVICE := SGH-T959
 PRODUCT_MODEL := SGH-T959
 PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=vibrant 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-T959 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"
 
 # Extra Vibrant overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrant