diff --git a/pkgs/development/compilers/ghc/6.11.nix b/pkgs/development/compilers/ghc/6.11.nix
new file mode 100644
index 00000000000..102f3e0a1db
--- /dev/null
+++ b/pkgs/development/compilers/ghc/6.11.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses, happy, alex}:
+
+stdenv.mkDerivation rec {
+  version = "6.11.20090916";
+  
+  name = "ghc-${version}";
+  
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
+    sha256 = "a229c5052f401d03cdb77b8a96643eb80ba3faf1a9d0578c6fede1ce2a63cede";
+  };
+
+  buildInputs = [ghc libedit perl gmp happy alex];
+
+  configureFlags=[
+    "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp}/include"
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  preConfigure=[
+    "make distclean"
+  ];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5751e14375a..b01e9b9e9d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1827,6 +1827,10 @@ let
       libXrandr xproto renderproto xextproto inputproto randrproto;
   });
 
+  # GHC
+
+  # GHC binaries are around for bootstrapping purposes
+
   #ghc = haskellPackages.ghc;
 
   ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
@@ -1843,6 +1847,9 @@ let
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
+  # For several compiler versions, we export a large set of Haskell-related
+  # packages.
+
   haskellPackages = haskellPackages_ghc6104;
 
   haskellPackages_ghc642 = import ./haskell-packages.nix {
@@ -1916,6 +1923,15 @@ let
     };
   });
 
+  haskellPackages_ghcHEAD = import ./haskell-packages.nix {
+    inherit pkgs;
+    ghc = import ../development/compilers/ghc/6.11.nix {
+      inherit fetchurl stdenv perl ncurses gmp libedit;
+      inherit (haskellPackages) happy alex; # hope these aren't required for the final version
+      ghc = ghc6101Binary;
+    };
+  };
+
   falcon = builderDefsPackage (import ../development/interpreters/falcon) {
     inherit cmake;
   };