diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 4c7b13af..fa657c43 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -12,7 +12,7 @@ Follow http://twitter.com/cmsrc for commit-by-commit updates.
 Maintainers:
 ------------
 * Nexus One: Cyanogen
-* Droid: Koush
+* Droid: optedoblivion, mtwebster
 * Dream/Sapphire: Cyanogen
 * Hero: Lox (GSM), Darchstar (CDMA)
 * Desire (GSM/CDMA): Kali-, Defer
@@ -104,9 +104,8 @@ CHANGELOG
 * Incredible: Better internal storage support - Josh Stone
 * Vision: Kernel 2.6.32.21, many improvements, 1.4GHz capable (coolbho3k), new ganeth driver (zinx)
 * Vision: Quickeys implementation - Optedoblivion
+* Droid: Kernel 2.6.32.9
 
-** Note on Email update: This requires a one-time wipe of application settings.
-                      Note that this will not affect your accounts themselves.
 
 ### 6.0.0
 * ANDROID: Google, HTC, Qualcomm, and everybody else.  We <3 U
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 6c19a5da..5e3b431b 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -21,7 +21,7 @@ ifdef CYANOGEN_NIGHTLY
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC4-Droid
+        ro.modversion=CyanogenMod-6.1.0-RC5-Droid
 endif
 
 PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG22D BUILD_DISPLAY_ID=FRG22D PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRG22D/50454:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRG22D 50454 release-keys" BUILD_NUMBER=50454 BUILD_UTC_DATE=1278333946 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build