diff --git a/pkgs/games/quake3/builder.sh b/pkgs/games/quake3/builder.sh
new file mode 100644
index 000000000000..a2f93d60e4ca
--- /dev/null
+++ b/pkgs/games/quake3/builder.sh
@@ -0,0 +1,12 @@
+source $stdenv/setup
+
+dontMakeInstall=1
+preInstall=preInstall
+preInstall() {
+    ensureDir $out/baseq3
+    make copyfiles COPYDIR=$out
+}
+
+genericBuild
+
+exit 1
diff --git a/pkgs/games/quake3/default.nix b/pkgs/games/quake3/default.nix
new file mode 100644
index 000000000000..57cfc2470b76
--- /dev/null
+++ b/pkgs/games/quake3/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, x11, SDL, mesa, openal}:
+
+# To run: ./ioquake3.i386 +set r_allowSoftwareGL 1
+
+/* To get hardware acceleration of NVidia cards:
+
+[eelco@hagbard:/nix/store/l28zjkflzlydmdqwh32a81krj7vn3xgh-quake3-icculus-1.33pre526]$ ls -l
+total 3080
+drwxr-xr-x  2 eelco users    4096 2006-01-26 15:10 baseq3
+-rw-r--r--  1 eelco users    5529 2006-01-26 15:36 botlib.log
+-rwxr-xr-x  1 eelco users  685640 2006-01-26 15:09 ioq3ded.i386
+-rwxr-xr-x  1 eelco users 1342232 2006-01-26 15:09 ioquake3.i386
+lrwxrwxrwx  1 eelco users      19 2006-01-26 15:18 libGL.so.1 -> /usr/lib/libGL.so.1
+lrwxrwxrwx  1 eelco users      23 2006-01-26 15:19 libGLcore.so.1 -> /usr/lib/libGLcore.so.1
+lrwxrwxrwx  1 eelco users      30 2006-01-26 15:24 libXcursor.so.1 -> /usr/X11R6/lib/libXcursor.so.1
+lrwxrwxrwx  1 eelco users      27 2006-01-26 15:34 libnvidia-tls.so.1 -> /usr/lib/libnvidia-tls.so.1
+-rw-r--r--  1 eelco users 1093352 2006-01-26 15:21 log
+drwxr-xr-x  2 eelco users    4096 2006-01-26 15:09 missionpack
+
+Then do: LD_LIBRARY_PATH=. ./ioquake3.i386
+
+Need to put this in a wrapper.
+
+Idem for adding the various *.pak files.
+
+*/
+
+stdenv.mkDerivation {
+  name = "quake3-icculus-1.33pre526";
+  src = /tmp/quake3-r526;
+  builder = ./builder.sh;
+  buildInputs = [x11 SDL mesa openal];
+}
\ No newline at end of file
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 746d5325acde..c0d39687f0da 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -2067,6 +2067,10 @@ rec {
     inherit (xlibs) xlibs;
   };
 
+  quake3 = import ../games/quake3 {
+    inherit fetchurl stdenv x11 SDL mesa openal;
+  };
+
   quake3demo = (import ../games/quake3demo) {
     inherit fetchurl stdenv xlibs mesa;
   };