diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 3a0d06dbcce..46e6dfba2d4 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -2,7 +2,7 @@
 , pdfSupport ? true
 , pngSupport ? true
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
-, zlib, libpng, pixman
+, zlib, libpng, pixman, libxcb, xcbutil
 }:
 
 assert postscriptSupport -> zlib != null;
@@ -17,14 +17,14 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig x11 fontconfig freetype pixman
+    pkgconfig x11 fontconfig freetype pixman libxcb xcbutil
   ];
 
   propagatedBuildInputs =
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     
-  configureFlags = ["--disable-static"] ++
+  configureFlags = ["--disable-static" "--enable-xcb"] ++
     stdenv.lib.optional pdfSupport "--enable-pdf";
 
   meta = {
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2aee79650d0..e1cccdff872 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -650,8 +650,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2;
       sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i";
     };
-    buildInputs = [pkgconfig libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
-  }) // {inherit libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
+    buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
+  }) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
     
   libXcomposite = (stdenv.mkDerivation {
     name = "libXcomposite-0.4.0";
@@ -780,8 +780,8 @@ rec {
       url = mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2;
       sha256 = "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y";
     };
-    buildInputs = [pkgconfig libX11 libXau libXext xextproto ];
-  }) // {inherit libX11 libXau libXext xextproto ;};
+    buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
+  }) // {inherit printproto libX11 libXau libXext xextproto ;};
     
   libXpm = (stdenv.mkDerivation {
     name = "libXpm-3.5.7";
@@ -1014,6 +1014,16 @@ rec {
     buildInputs = [pkgconfig perl ];
   }) // {inherit perl ;};
     
+  printproto = (stdenv.mkDerivation {
+    name = "printproto-1.0.4";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2;
+      sha256 = "1gnkpz8iyl27gyjvy8rhm9v6g5qvz3632pn5djxks577i0qsjngh";
+    };
+    buildInputs = [pkgconfig ];
+  }) // {inherit ;};
+    
   randrproto = (stdenv.mkDerivation {
     name = "randrproto-1.2.1";
     builder = ./builder.sh;
@@ -1191,8 +1201,8 @@ rec {
       url = http://xcb.freedesktop.org/dist/xcb-util-0.3.0.tar.bz2;
       sha256 = "1aq82ymgvrr5hav62mjax8qar9qiszw0cj719wlznh251v0xynpq";
     };
-    buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+    buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+  }) // {inherit gperf m4 libxcb xproto ;};
     
   xclock = (stdenv.mkDerivation {
     name = "xclock-1.0.3";
@@ -2074,8 +2084,8 @@ rec {
       url = mirror://xorg/X11R7.4/src/everything/xorg-server-1.5.1.tar.bz2;
       sha256 = "08gbfdclx1cqlryxgqa54j2bcri0n816ldq4nyrabq5fzw5qhdig";
     };
-    buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; 
-  }) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;};
+    buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess]; 
+  }) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation {
     name = "xorg-sgml-doctools-1.2";
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b2e3fa78ff6..664517ba504 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -21,25 +21,13 @@ my %pcMap;
 my %extraAttrs;
 
 
+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "hal", "openssl", "gperf", "m4");
+$pcMap{$_} = $_ foreach @missingPCs;
 $pcMap{"freetype2"} = "freetype";
-$pcMap{"fontconfig"} = "fontconfig";
 $pcMap{"libpng12"} = "libpng";
-$pcMap{"libdrm"} = "libdrm";
-$pcMap{"libXaw"} = "libXaw";
-$pcMap{"zlib"} = "zlib";
-$pcMap{"perl"} = "perl";
-$pcMap{"python"} = "python";
-$pcMap{"mesa"} = "mesa";
-$pcMap{"mkfontscale"} = "mkfontscale";
-$pcMap{"mkfontdir"} = "mkfontdir";
-$pcMap{"bdftopcf"} = "bdftopcf";
-$pcMap{"libxslt"} = "libxslt";
 $pcMap{"dbus-1"} = "dbus";
-$pcMap{"hal"} = "hal";
 $pcMap{"uuid"} = "e2fsprogs";
 $pcMap{"gl"} = "mesa";
-$pcMap{"openssl"} = "openssl";
-
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";
 
@@ -195,6 +183,7 @@ while (<>) {
     push @requires, "zlib" if $pkg =~ /xorgserver/;
     push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/;
     push @requires, "libxslt" if $pkg =~ /libxcb/;
+    push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/;
     
     print "REQUIRES @requires => $pkg\n";
     $pkgRequires{$pkg} = \@requires;
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index c731277fe41..796c7c10e83 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -2,6 +2,7 @@ mirror://xorg/individual/util/imake-1.0.2.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.1.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2
 mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2
+mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7323181246..8ff10725f2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2583,7 +2583,7 @@ let
 
   cairo = import ../development/libraries/cairo {
     inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
-    inherit (xlibs) pixman;
+    inherit (xlibs) pixman libxcb xcbutil;
   };
 
   cairomm = import ../development/libraries/cairomm {
@@ -4809,7 +4809,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa mesaHeaders
-      xkeyboard_config dbus hal python e2fsprogs openssl;
+      xkeyboard_config dbus hal python e2fsprogs openssl gperf m4;
   });
 
   zabbixAgent = import ../servers/monitoring/zabbix {