diff --git a/pkgs/development/libraries/mesa/headers.nix b/pkgs/development/libraries/mesa/headers.nix
new file mode 100644
index 00000000000..d90f9be6fd0
--- /dev/null
+++ b/pkgs/development/libraries/mesa/headers.nix
@@ -0,0 +1,10 @@
+{stdenv, mesaSrc}:
+
+stdenv.mkDerivation {
+  name = "mesa-headers-6.5.2"; # !!! keep up-to-date
+  buildCommand = "
+    unpackFile ${mesaSrc}
+    ensureDir $out/include
+    cp -prvd Mesa-*/include/GL $out/include/
+  ";
+}
\ No newline at end of file
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 73d27283c30..c8108fbcd12 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1,6 +1,6 @@
 # This is a generated file.  Do not edit!
 { stdenv, fetchurl, pkgconfig, freetype, fontconfig
-, libxslt, expat, libdrm, libpng, zlib, perl, mesa
+, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
 }:
 
 rec {
@@ -2046,13 +2046,13 @@ rec {
   }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoi810 = (stdenv.mkDerivation {
-    name = "xf86-video-i810-1.6.5";
+    name = "xf86-video-i810-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i810-X11R7.2-1.6.5.tar.bz2;
-      sha256 = "04f65vcgzjxi7sl7ps9xs8i481q2kj7fj4q2n5cgwlaayamgnlf4";
+      url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2;
+      sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z";
     };
-    buildInputs = [pkgconfig fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ];
+    buildInputs = [pkgconfig fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC mesaHeaders ];
   }) // {inherit fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;};
     
   xf86videoimstt = (stdenv.mkDerivation {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9e551ffd02c..9dbc44bea3a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -33,6 +33,7 @@ $pcMap{"libXaw"} = "libXaw";
 $pcMap{"zlib"} = "zlib";
 $pcMap{"perl"} = "perl";
 $pcMap{"mesa"} = "mesa";
+$pcMap{"mesaHeaders"} = "mesaHeaders";
 $pcMap{"mkfontscale"} = "mkfontscale";
 $pcMap{"mkfontdir"} = "mkfontdir";
 $pcMap{"bdftopcf"} = "bdftopcf";
@@ -178,7 +179,7 @@ while (<>) {
     process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
 
     #push @requires, "mesa" if $pkg =~ /xorgserver/ or $pkg =~ /xf86videoi810/;
-    push @requires, "glproto" if $pkg =~ /xf86videoi810/;
+    push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videoi810/;
     push @requires, "zlib" if $pkg =~ /xorgserver/;
     push @requires, "libxslt" if $pkg =~ /libxcb/;
     
@@ -197,7 +198,7 @@ print OUT "";
 print OUT <<EOF;
 # This is a generated file.  Do not edit!
 { stdenv, fetchurl, pkgconfig, freetype, fontconfig
-, libxslt, expat, libdrm, libpng, zlib, perl, mesa
+, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
 }:
 
 rec {
@@ -241,3 +242,4 @@ EOF
 print OUT "}\n";
 
 close OUT;
+>
diff --git a/pkgs/servers/x11/xorg/tarballs b/pkgs/servers/x11/xorg/tarballs
index 190655239cf..d4c34d12b3e 100644
--- a/pkgs/servers/x11/xorg/tarballs
+++ b/pkgs/servers/x11/xorg/tarballs
@@ -192,7 +192,6 @@ http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-fbd
 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-glint-X11R7.1-1.1.1.tar.bz2
 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i128-X11R7.2-1.2.1.tar.bz2
 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i740-X11R7.1-1.1.0.tar.bz2
-http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i810-X11R7.2-1.6.5.tar.bz2
 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-imstt-X11R7.1-1.1.0.tar.bz2
 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-mga-X11R7.2-1.4.6.1.tar.bz2
 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2
@@ -289,3 +288,4 @@ http://xcb.freedesktop.org/dist/libxcb-1.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-proto-1.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2
 http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
+http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6795ca6ad31..3f41657d16a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1575,6 +1575,11 @@ rec {
     inherit (xlibs) libXmu libXi;
   };
 
+  mesaHeaders = import ../development/libraries/mesa/headers.nix {
+    inherit stdenv;
+    mesaSrc = mesa.src;
+  };
+
   mpeg2dec = import ../development/libraries/mpeg2dec {
     inherit fetchurl stdenv;
   };
@@ -2097,7 +2102,7 @@ rec {
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
-      libxslt expat libdrm libpng zlib perl mesa;
+      libxslt expat libdrm libpng zlib perl mesa mesaHeaders;
   });