diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6c382cb89ebc..edcac8538e38 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1285,11 +1285,11 @@ rec {
   }) // {inherit libX11 ;};
     
   xextproto = (stdenv.mkDerivation {
-    name = "xextproto-7.0.3";
+    name = "xextproto-7.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.4/src/everything/xextproto-7.0.3.tar.bz2;
-      sha256 = "1d2d7pbxahsjxhcw4snnwcy0qli88xwrqp35zyd1bjai6s744wir";
+      url = mirror://xorg/individual/proto/xextproto-7.0.5.tar.bz2;
+      sha256 = "0hmhlmn6jv6ybv6q57s0377bvqrfrshi9z1dgdk7ibfsjqy1ygnk";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
@@ -2118,11 +2118,11 @@ rec {
   }) // {inherit libX11 ;};
     
   xproto = (stdenv.mkDerivation {
-    name = "xproto-7.0.13";
+    name = "xproto-7.0.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.4/src/everything/xproto-7.0.13.tar.bz2;
-      sha256 = "14nmxjbm1cmipdn7m2mm9jjsgchd04fsynrsa4lxxxb95n92hqvg";
+      url = mirror://xorg/individual/proto/xproto-7.0.15.tar.bz2;
+      sha256 = "1vkbqy2vs0jf1z043fyjw1345rmh16lxzvgrd9p43mwl7syd137x";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.4.list b/pkgs/servers/x11/xorg/tarballs-7.4.list
index a9f9339d93d5..79a43fbdf839 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.4.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.4.list
@@ -114,7 +114,7 @@ mirror://xorg/X11R7.4/src/everything/xcursor-themes-1.0.1.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xdriinfo-1.0.2.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xev-1.0.3.tar.bz2
-mirror://xorg/X11R7.4/src/everything/xextproto-7.0.3.tar.bz2
+mirror://xorg/individual/proto/xextproto-7.0.5.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xf86bigfontproto-1.1.2.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xf86dga-1.0.2.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2
@@ -194,7 +194,7 @@ mirror://xorg/individual/xserver/xorg-server-1.5.3.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xorg-sgml-doctools-1.2.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xpr-1.0.2.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xprop-1.0.4.tar.bz2
-mirror://xorg/X11R7.4/src/everything/xproto-7.0.13.tar.bz2
+mirror://xorg/individual/proto/xproto-7.0.15.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xrandr-1.2.3.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xrdb-1.0.5.tar.bz2
 mirror://xorg/X11R7.4/src/everything/xrefresh-1.0.2.tar.bz2