diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 047683a285..fcd4c8a7fd 100755
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -3,11 +3,6 @@ DL_DIR = "POKYROOT/sources"
 BBFILES := "POKYROOT/openembedded/packages/*/*.bb"
 
 BBMASK = ""
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 # Uncomment this to specify where BitBake should create its temporary files.
 # Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
@@ -53,5 +48,3 @@ BBINCLUDELOGS = "yes"
 # a cvs:// URI.  Uncomment this, if you not want to pull directly from CVS.
 CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
 
-PREFERRED_VERSION_gcc-cross= "3.4.3"
-PREFERRED_VERSION_gcc-cross-initial= "3.4.3"
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index c338291abe..ab115ac292 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -19,14 +19,14 @@ TARGET_FPU ?= "soft"
 
 PARALLEL_INSTALL_MODULES = "1"
 
-FEED_URIS += " \
-           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
+#FEED_URIS += " \
+#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
+#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
+#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
+#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
+#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
+#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 OEINCLUDELOGS = "yes"
@@ -39,110 +39,101 @@ KERNEL_CONSOLE = "ttyS0"
 #
 # Core Versions
 #
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 PREFERRED_VERSION_gcc-cross ?= "3.4.4"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 PREFERRED_VERSION_hostap-modules ?= "0.3.9"
 
 
-#
-# Opie and E Image preferred verions
-# Use our own instead of GPE
-#
-OPIE_VERSION = "1.2.1"
-include conf/distro/preferred-opie-versions.inc
-#include conf/distro/preferred-e-versions.inc
-
-
 #
 # Preferred providers:
 #
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 #fix some iconv issues, needs to be adjusted when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv=glibc
-PREFERRED_PROVIDER_virtual/libintl=glibc
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_x11 = "diet-x11"
-PREFERRED_PROVIDER_gconf=gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+PREFERRED_PROVIDER_virtual/libiconv ?= glibc
+PREFERRED_PROVIDER_virtual/libintl ?= glibc
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
+PREFERRED_PROVIDER_x11 ?= "diet-x11"
+PREFERRED_PROVIDER_gconf ?= gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
 
-PREFERRED_VERSION_gnome-vfs-dbus = "2.12.0+cvs${SRCDATE}"
+PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
 
 
 #
 # CVS Dates to use:
 #
-#SRCDATE_gnome-vfs-dbus = "20051215"
-SRCDATE_gconf-dbus = "20060119"
-SRCDATE_gnome-vfs-dbus = "20060119"
-SRCDATE_contacts = "20060207"
-SRCDATE_dates = "20060214"
-SRCDATE_gtkhtml2 = "20060213"
-SRCDATE_eds-dbus = "20060126"
-SRCDATE_minimo = "20050401"
-SRCDATE_ipkg-utils-native = "20050930"
-SRCDATE_ipkg-link-1 = "20050930"
-SRCDATE_ipkg-utils = "20050930"
-SRCDATE_ipkg-link = "20050930"
-SRCDATE_matchbox-common = "20051101"
-SRCDATE_matchbox-config-gtk = "20051101"
-SRCDATE_matchbox-desktop = "20060120"
-SRCDATE_matchbox-keyboard = "20051101"
-SRCDATE_matchbox-panel = "20051101"
-SRCDATE_matchbox-panel-manager = "20051101"
-SRCDATE_matchbox-stroke = "20051101"
-SRCDATE_matchbox-themes-extra = "20051101"
-SRCDATE_matchbox-wm = "20060120"
-SRCDATE_libmatchbox = "20060120"
-SRCDATE_tslib = "20051101"
-SRCDATE_xext = "20051101"
-SRCDATE_renderext = "20051101"
-SRCDATE_libxrender = "20051101"
-SRCDATE_fixesext = "20051101"
-SRCDATE_damageext = "20051101"
-SRCDATE_compositeext = "20051101"
-SRCDATE_xcalibrateext = "20051101"
-SRCDATE_recordext = "20051101"
-SRCDATE_libfakekey = "20051101"
-SRCDATE_xmodmap = "20051101"
-SRCDATE_xrandr = "20051101"
-SRCDATE_xtst = "20051101"
-SRCDATE_xcalibrate = "20051101"
-SRCDATE_xmu = "20051115"
-SRCDATE_xdpyinfo = "20051115"
-SRCDATE_xauth = "20060120"
+#SRCDATE_gnome-vfs-dbus ?= "20051215"
+SRCDATE_gconf-dbus ?= "20060119"
+SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_contacts ?= "20060207"
+SRCDATE_dates ?= "20060323"
+SRCDATE_gtkhtml2 ?= "20060323"
+SRCDATE_web ?= "20060325"
+SRCDATE_eds-dbus ?= "20060126"
+SRCDATE_minimo ?= "20050401"
+SRCDATE_ipkg-utils-native ?= "20050930"
+SRCDATE_ipkg-link-1 ?= "20050930"
+SRCDATE_ipkg-utils ?= "20050930"
+SRCDATE_ipkg-link ?= "20050930"
+SRCDATE_matchbox-common ?= "20051101"
+SRCDATE_matchbox-config-gtk ?= "20051101"
+SRCDATE_matchbox-desktop ?= "20060120"
+SRCDATE_matchbox-keyboard ?= "20051101"
+SRCDATE_matchbox-panel ?= "20051101"
+SRCDATE_matchbox-panel-manager ?= "20051101"
+SRCDATE_matchbox-stroke ?= "20051101"
+SRCDATE_matchbox-themes-extra ?= "20051101"
+SRCDATE_matchbox-wm ?= "20060120"
+SRCDATE_libmatchbox ?= "20060120"
+SRCDATE_tslib ?= "20051101"
+SRCDATE_xext ?= "20051101"
+SRCDATE_renderext ?= "20051101"
+SRCDATE_libxrender ?= "20051101"
+SRCDATE_fixesext ?= "20051101"
+SRCDATE_damageext ?= "20051101"
+SRCDATE_compositeext ?= "20051101"
+SRCDATE_xcalibrateext ?= "20051101"
+SRCDATE_recordext ?= "20051101"
+SRCDATE_libfakekey ?= "20051101"
+SRCDATE_xmodmap ?= "20051101"
+SRCDATE_xrandr ?= "20051101"
+SRCDATE_xtst ?= "20051101"
+SRCDATE_xcalibrate ?= "20051101"
+SRCDATE_xmu ?= "20051115"
+SRCDATE_xdpyinfo ?= "20051115"
+SRCDATE_xauth ?= "20060120"
 
 #
 # Preferred Versions:
 #
-PREFERRED_VERSION_matchbox = "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
-PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
+PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}"
 
-#PREFERRED_VERSION_atk = "1.10.0"
-#PREFERRED_VERSION_cairo = "1.0.0"
-PREFERRED_VERSION_glib-2.0 = "2.8.1"
-#PREFERRED_VERSION_gtk+ = "2.8.9"
-#PREFERRED_VERSION_pango = "1.10.0"
+#PREFERRED_VERSION_atk ?= "1.10.0"
+#PREFERRED_VERSION_cairo ?= "1.0.0"
+PREFERRED_VERSION_glib-2.0 ?= "2.8.1"
+#PREFERRED_VERSION_gtk+ ?= "2.8.9"
+#PREFERRED_VERSION_pango ?= "1.10.0"
 
-PREFERRED_VERSION_atk = "1.9.0"
-#PREFERRED_VERSION_glib-2.0 = "2.6.4"
-PREFERRED_VERSION_gtk+ = "2.6.7"
-PREFERRED_VERSION_pango = "1.10.0"
+PREFERRED_VERSION_atk ?= "1.9.0"
+#PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_gtk+ ?= "2.6.7"
+PREFERRED_VERSION_pango ?= "1.10.0"
 
-PREFERRED_VERSION_dbus = "0.60"
+PREFERRED_VERSION_dbus ?= "0.60"
 
 PREFERRED_VERSION_diet-x11 ?= "6.2.1"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"