diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index b7d6df47a2..2eb48a2dd1 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -95,32 +95,46 @@ SRCDATE_xcalibrate ?= "20060312"
 SRCDATE_qemu ?= "20070613"
 SRCDATE_qemu-native ?= "20070613"
 SRCDATE_oprofile ?= "20070807"
-SRCREV_pn-oprofileui = "127"
+SRCREV_pn-oprofileui ?= "127"
 SRCREV_pn-zaurusd ?= "273"
 SRCREV_pn-owl-video-widget ?= "266"
 SRCREV_pn-psplash ?= "266"
 SRCDATE_maemo-mapper-nohildon ?= "20061114"
 SRCREV_pn-exmap-console ?= "266"
-SRCREV_pn-gtk-sato-engine = "90"
-SRCREV_pn-matchbox-theme-sato = "90"
-SRCDATE_tasks = "20070711"
-SRCREV_pn-sato-icon-theme = "90"
-SRCREV_pn-matchbox-desktop-sato = "76"
-SRCREV_pn-evince = "2437"
-SRCREV_pn-oh-puzzles = "22"
-SRCREV_pn-libowl = "277"
-SRCDATE_libxcalibrate = "20070607"
-SRCDATE_calibrateproto = "20070607"
-SRCDATE_hal-info = "20070727"
-SRCDATE_gtk-theme-torturer = "20070529"
-SRCREV_pn-libsyncml = "241"
-SRCREV_pn-matchbox-applet-light = "1548"
-SRCREV_pn-fstests = "266"
+SRCREV_pn-gtk-sato-engine ?= "90"
+SRCREV_pn-matchbox-theme-sato ?= "90"
+SRCDATE_tasks ?= "20070711"
+SRCREV_pn-sato-icon-theme ?= "90"
+SRCREV_pn-matchbox-desktop-sato ?= "76"
+SRCREV_pn-evince ?= "2437"
+SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-libowl ?= "277"
+SRCDATE_libxcalibrate ?= "20070607"
+SRCDATE_calibrateproto ?= "20070607"
+SRCDATE_hal-info ?= "20070727"
+SRCDATE_gtk-theme-torturer ?= "20070529"
+SRCREV_pn-libsyncml ?= "241"
+SRCREV_pn-matchbox-applet-light ?= "1548"
+SRCREV_pn-fstests ?= "266"
 SRCDATE_abiword ?= "20070130"
 SRCREV_pn-xvideo-tests ?= "272"
 SRCREV_pn-clutter ?= "1196"
 SRCDATE_libgsmd ?= "20070801"
 
+# Previously floating revisions
+SRCREV_pn-aaina ?= "1231"
+SRCREV_pn-clutter-cairo ?= "1219"
+SRCREV_pn-clutter-gst ?= "1220"
+SRCREV_pn-table ?= "969"
+SRCREV_pn-libmatchbox ?= "1531"
+SRCREV_pn-msynctool ?= "314"
+SRCREV_pn-libopensync-plugin-file-sync ?= "2392"
+SRCREV_pn-libopensync-plugin-evo2-sync ?= "2394"
+SRCREV_pn-libopensync ?= "2430"
+SRCREV_pn-libsync ?= "208"
+SRCREV_pn-tasks ?= "299"
+
+
 #
 # Preferred Versions:
 #
@@ -138,9 +152,9 @@ PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svnr${SRCREV}"
 PREFERRED_VERSION_matchbox-wm ?= "1.2+svnr${SRCREV}"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
 PREFERRED_VERSION_gtk-engines ?= "2.10.2"
-PREFERRED_VERSION_gtk-sato-engine = "0.1"
-PREFERRED_VERSION_matchbox-theme-sato = "0.1"
-PREFERRED_VERSION_sato-icon-theme = "0.1"
+PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
+PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
+PREFERRED_VERSION_sato-icon-theme ?= "0.1"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.14.0"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"