diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 8359a93..7e31f88 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -40,7 +40,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Desire
+        ro.modversion=CyanogenMod-6.1.0-RC0-Desire
 endif
 
 #
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index bcb2535..ee79437 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -43,12 +43,11 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-DS
+        ro.modversion=CyanogenMod-6.1.0-RC0-DS
 endif
 
 # Use the audio profile hack
 WITH_DS_HTCACOUSTIC_HACK := true
-PRODUCT_SPECIFIC_DEFINES += WITH_DS_HTCACOUSTIC_HACK
 
 #
 # Copy DS specific prebuilt files
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index cf14d37..3e5925a 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -34,7 +34,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Slide
+        ro.modversion=CyanogenMod-6.1.0-RC0-Slide
 endif
 
 #
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index 13a3373..6cf094a 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -25,10 +25,10 @@
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-HERO
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Hero
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Hero-alpha0
+        ro.modversion=CyanogenMod-6.1.0-RC0-Hero
 endif
 
 #
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 13dbf3b..e4ee89e 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -28,7 +28,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-	 ro.modversion=CyanogenMod-6.0.0-Heroc
+	 ro.modversion=CyanogenMod-6.1.0-RC0-Heroc
 endif
 
 #
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index b5b6e42..1655f38 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -35,7 +35,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Liberty
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Liberty
+        ro.modversion=CyanogenMod-6.1.0-RC0-Liberty
 endif
 
 #
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index ac2e142..0bb6fe6 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -42,7 +42,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-N1
+        ro.modversion=CyanogenMod-6.1.0-RC0-N1
 endif
 
 #
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 7912f98..f3f3e16 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -21,7 +21,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Droid
+        ro.modversion=CyanogenMod-6.1.0-RC0-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
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index b6c27c8..ab69a7e 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -25,10 +25,10 @@
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Supersonic
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Supersonic
+        ro.modversion=CyanogenMod-6.1.0-RC0-Supersonic
 endif
 
 #
diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk
index 146eca5..0a1e36a 100644
--- a/products/cyanogen_vibrant.mk
+++ b/products/cyanogen_vibrant.mk
@@ -28,7 +28,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Vibrant
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Vibrant-alpha0
+        ro.modversion=CyanogenMod-6.1.0-RC0-Vibrant
 endif
 
 #