diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 9c88dc67cf8..1a86b878d92 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,18 +1,19 @@
 a :  
 let 
   buildInputs = with a; [
-    mpfr m4 binutils emacs
+    mpfr m4 binutils emacs gmp
     libX11 xproto inputproto libXi 
     libXext xextproto libXt libXaw libXmu
+    zlib which
   ]; 
 in
 rec {
   src = a.fetchcvs {
     cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl";
     module = "gcl";
-    tag = "Version_2_6_8pre";
-    date = "2009-11-05";
-    sha256 = "5aa6c1616f585466a6aae91e38472f20539be4ce978fd458592e425904bdd9bc";
+    # tag = "Version_2_6_8pre";
+    date = "2010-07-01";
+    sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d";
   };
 
   name = "gcl-2.6.8pre";
@@ -20,11 +21,16 @@ rec {
   configureFlags = [];
 
   preBuild = a.fullDepEntry (''
-    echo '(defun init_gcl_cmpmap (&rest args))' >> cmpnew/cmpmap.lsp
+    sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
+    sed -re "s@if test -d /proc/self @if false @" -i configure
+    sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.gcc.gcc}/include -I${a.stdenv.gcc.libc}/include ^g' -i makefile
   '') ["minInit" "doUnpack"];
 
+  fixConfigure = a.doPatchShebangs ".";
+
   /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doConfigure" "doMakeInstall"];
+  phaseNames = ["doUnpack" "fixConfigure" "preBuild" 
+    "doConfigure" "doMakeInstall"];
       
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68038c98c45..b846693073c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2336,16 +2336,13 @@ let
     enableMultilib = false;
   }));
 
-  /*
-  Broken; fails because of unability to find its own symbols during linking
-
   gcl = builderDefsPackage ../development/compilers/gcl {
-    inherit mpfr m4 binutils fetchcvs emacs;
+    inherit mpfr m4 binutils fetchcvs emacs zlib which 
+      gmp;
     inherit (xlibs) libX11 xproto inputproto libXi
       libXext xextproto libXt libXaw libXmu;
-    stdenv = (overrideGCC stdenv gcc34) // {gcc = gcc33;};
+    inherit stdenv;
   };
-  */
 
   # GHC