diff --git a/pkgs/development/libraries/mesa/builder.sh b/pkgs/development/libraries/mesa/builder.sh
new file mode 100644
index 000000000000..445d9a3dd9fa
--- /dev/null
+++ b/pkgs/development/libraries/mesa/builder.sh
@@ -0,0 +1,14 @@
+. $stdenv/setup
+
+makeFlags="linux-x86"
+
+installPhase=installPhase
+installPhase() {
+    mkdir $out
+    mkdir $out/lib
+    cp -pvd lib/* $out/lib
+    mkdir $out/include
+    cp -rv include/GL $out/include
+}
+
+genericBuild
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
new file mode 100644
index 000000000000..7f0fc6b68752
--- /dev/null
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, xlibs}:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "mesa-6.0.1";
+  srcs = [
+    (fetchurl {
+      url = http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.0.1.tar.bz2;
+      md5 = "b7f14088c5c2f14490d2739a91102112";
+    })
+    (fetchurl {
+      url = http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-6.0.1.tar.bz2;
+      md5 = "dd6aadfd9ca8e1cfa90c6ee492bc6f43";
+    })
+  ];
+  builder = ./builder.sh;
+  buildInputs = [xlibs.xlibs xlibs.libXmu xlibs.libXi];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index eed2d876ae8e..572898afc43b 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -440,6 +440,10 @@ rec {
     inherit fetchurl stdenv pkgconfig freetype expat;
   };
 
+  mesa = (import ../development/libraries/mesa) {
+    inherit fetchurl stdenv xlibs;
+  };
+
   chmlib = (import ../development/libraries/chmlib) {
     inherit fetchurl stdenv libtool;
   };