diff -ruN openembedded_old/recipes/python/python_2.6.2.bb openembedded/recipes/python/python_2.6.2.bb
--- openembedded_old/recipes/python/python_2.6.2.bb	2010-02-10 22:18:21.623004460 +0100
+++ openembedded/recipes/python/python_2.6.2.bb	2010-02-10 22:52:41.040143366 +0100
@@ -1,5 +1,5 @@
 require python.inc
-DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
+DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # set to .0 on every increase of INC_PR
 PR = "${INC_PR}.0"
diff -ruN openembedded_old/recipes/xcb/libxcb/configure15.patch openembedded/recipes/xcb/libxcb/configure15.patch
--- openembedded_old/recipes/xcb/libxcb/configure15.patch	1970-01-01 01:00:00.000000000 +0100
+++ openembedded/recipes/xcb/libxcb/configure15.patch	2010-02-10 23:13:54.146127972 +0100
@@ -0,0 +1,20 @@
+--- configure.ac~	2010-02-10 22:40:48.351378295 +0100
++++ configure.ac	2010-02-10 22:41:52.406127484 +0100
+@@ -54,7 +54,7 @@
+ 
+ # Find the xcb-proto protocol descriptions
+ AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
+-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
++XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR}`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
+ AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
+ AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
+ 
+@@ -64,7 +64,7 @@
+ 
+ # Find the xcbgen Python package
+ AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR)
+-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
++XCBPROTO_XCBPYTHONDIR=${STAGING_DIR}`$PKG_CONFIG --variable=pythondir xcb-proto`
+ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
+ AC_SUBST(XCBPROTO_XCBPYTHONDIR)
+ 
diff -ruN openembedded_old/recipes/xcb/libxcb.inc openembedded/recipes/xcb/libxcb.inc
--- openembedded_old/recipes/xcb/libxcb.inc	2010-02-10 22:21:03.220001665 +0100
+++ openembedded/recipes/xcb/libxcb.inc	2010-01-07 20:20:16.296083000 +0100
@@ -7,38 +7,7 @@
 DEPENDS = "xcb-proto xproto libxau libxslt-native"
 # DEPENDS += "xsltproc-native gperf-native"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
-        file://configure.patch;patch=1;pnum=0"
-
-PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
-             libxcb-randr libxcb-record libxcb-render libxcb-res \
-             libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \
-             libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \
-             libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc"
-
-FILES_${PN} = "${libdir}/libxcb.so.*"
-#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h"
-FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*"
-FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*"
-FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*"
-FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*"
-FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*"
-FILES_libxcb-record = "${libdir}/libxcb-record.so.*"
-FILES_libxcb-render = "${libdir}/libxcb-render.so.*"
-FILES_libxcb-res = "${libdir}/libxcb-res.so.*"
-FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*"
-FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*"
-FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*"
-FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*"
-FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*"
-FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*"
-FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*"
-FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*"
-FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*"
-FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*"
-FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*"
-FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*"
-FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
+SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
 
diff -ruN openembedded_old/recipes/xcb/libxcb_1.5.bb openembedded/recipes/xcb/libxcb_1.5.bb
--- openembedded_old/recipes/xcb/libxcb_1.5.bb	1970-01-01 01:00:00.000000000 +0100
+++ openembedded/recipes/xcb/libxcb_1.5.bb	2010-02-10 23:13:41.906127007 +0100
@@ -0,0 +1,7 @@
+include libxcb.inc
+PR = "r0"
+
+DEPENDS += "python"
+
+SRC_URI += "file://configure15.patch;patch=1;pnum=0"
+
diff -ruN openembedded_old/recipes/xcb/xcb-proto_1.6.bb openembedded/recipes/xcb/xcb-proto_1.6.bb
--- openembedded_old/recipes/xcb/xcb-proto_1.6.bb	1970-01-01 01:00:00.000000000 +0100
+++ openembedded/recipes/xcb/xcb-proto_1.6.bb	2010-02-10 22:29:40.704383621 +0100
@@ -0,0 +1,16 @@
+include xcb-proto.inc
+PR = "r0"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
+
+
+do_stage() {
+	autotools_stage_all
+}
+
+##FILES_${PN} += "${datadir}/xcb/*.xml"
+FILES_${PN}-dev += "${datadir}/xcb/xcb.xsd"
+FILES_${PN}-dev += "${libdir}/python2.6/site-packages/xcbgen/*.py"
+FILES_${PN}-dev += "${libdir}/python2.6/site-packages/xcbgen/*.pyc"
+FILES_${PN}-dev += "${libdir}/python2.6/site-packages/xcbgen/*.pyo"
+
diff -ruN openembedded_old/recipes/xorg-lib/libx11_1.3.2.bb openembedded/recipes/xorg-lib/libx11_1.3.2.bb
--- openembedded_old/recipes/xorg-lib/libx11_1.3.2.bb	2010-02-10 22:22:22.760003855 +0100
+++ openembedded/recipes/xorg-lib/libx11_1.3.2.bb	2010-02-10 23:25:13.472377076 +0100
@@ -2,7 +2,7 @@
 
 DESCRIPTION = "Base X libs."
 DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb"
 PROVIDES = "virtual/libx11"
 PE = "1"
 PR = "r3"
@@ -13,7 +13,7 @@
             file://dolt-fix.patch;patch=1 \
             file://keysymdef_include.patch;patch=1"
 
-EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
 do_compile() {
 	(