diff --git a/pkgs/games/quake3demo/builder.sh b/pkgs/games/quake3demo/builder.sh
new file mode 100644
index 00000000000..e2349144faa
--- /dev/null
+++ b/pkgs/games/quake3demo/builder.sh
@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+skip=165
+
+mkdir $out
+
+cd $out
+
+tail +165 $src | tar xvfz -
diff --git a/pkgs/games/quake3demo/default.nix b/pkgs/games/quake3demo/default.nix
new file mode 100644
index 00000000000..34105c6124e
--- /dev/null
+++ b/pkgs/games/quake3demo/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, xlibs, mesa}:
+
+assert stdenv.system == "i686-linux";
+
+let {
+
+  raw = stdenv.mkDerivation {
+    name = "quake3demo-1.11-6";
+    src = fetchurl {
+      url = ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh;
+      md5 = "484610c1ce34272223a52ec331c99d5d";
+    };
+    builder = ./builder.sh;
+  };
+
+  body = stdenv.mkDerivation {
+    name = raw.name;
+    builder = ./make-wrapper.sh;
+    inherit raw mesa;
+    inherit (xlibs) libX11 libXext;
+  };
+
+}
diff --git a/pkgs/games/quake3demo/make-wrapper.sh b/pkgs/games/quake3demo/make-wrapper.sh
new file mode 100644
index 00000000000..c7cf0a9308b
--- /dev/null
+++ b/pkgs/games/quake3demo/make-wrapper.sh
@@ -0,0 +1,17 @@
+. $stdenv/setup
+
+mkdir $out
+mkdir $out/bin
+mkdir $out/links
+
+ln -s $raw/* $out/links
+ln -s $out/links/bin/x86/glibc-2.1/q3demo $out/links/q3demo
+
+glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+
+cat > $out/bin/q3ademo <<EOF
+#! $SHELL -e
+LD_LIBRARY_PATH=$libX11/lib:$libXext/lib:$mesa/lib $glibc/lib/ld-linux.so.2 $out/links/q3demo "\$@" +set s_initsound 0
+EOF
+
+chmod +x $out/bin/q3ademo
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 572898afc43..abf1544b162 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -607,6 +607,10 @@ rec {
     inherit (xlibs) xlibs;
   };
 
+  quake3demo = (import ../games/quake3demo) {
+    inherit fetchurl stdenv xlibs mesa;
+  }
+
 
   ### MISC