diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 847ffb92ba05..28eb2a1b8e41 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -888,11 +888,11 @@ let
   })) // {inherit ;};
     
   libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
-    name = "libxcb-1.8.1";
+    name = "libxcb-1.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2;
-      sha256 = "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j";
+      url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2;
+      sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
@@ -1138,11 +1138,11 @@ let
   })) // {inherit ;};
     
   xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
-    name = "xcb-proto-1.7.1";
+    name = "xcb-proto-1.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2;
-      sha256 = "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd";
+      url = mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2;
+      sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93";
     };
     buildInputs = [pkgconfig python ];
   })) // {inherit python ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 1560e4bfd28c..81fab682bfcc 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -60,7 +60,7 @@ mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2
+mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
@@ -103,7 +103,7 @@ mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2
 mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2
+mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2