diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index b4d4859c21d..9c88dc67cf8 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,19 +1,30 @@
 a :  
 let 
-  s = import ./src-for-default.nix;
   buildInputs = with a; [
-    gmp mpfr m4 binutils 
+    mpfr m4 binutils emacs
+    libX11 xproto inputproto libXi 
+    libXext xextproto libXt libXaw libXmu
   ]; 
 in
 rec {
-  src = a.fetchUrlFromSrcInfo s;
+  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";
+  };
 
-  inherit (s) name;
+  name = "gcl-2.6.8pre";
   inherit buildInputs;
   configureFlags = [];
 
+  preBuild = a.fullDepEntry (''
+    echo '(defun init_gcl_cmpmap (&rest args))' >> cmpnew/cmpmap.lsp
+  '') ["minInit" "doUnpack"];
+
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = ["preBuild" "doConfigure" "doMakeInstall"];
       
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
diff --git a/pkgs/development/compilers/gcl/src-for-default.nix b/pkgs/development/compilers/gcl/src-for-default.nix
deleted file mode 100644
index 0a1d0aa5fc3..00000000000
--- a/pkgs/development/compilers/gcl/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="2.6.7";
-   name="gcl-2.6.7";
-   hash="01icfa7iaxninhyhpkzjbhcrr2wbnw6x0sk680zx0api0fy3989a";
-   url="http://ftp.gnu.org/gnu/gcl/gcl-${version}.tar.gz";
-   advertisedUrl="http://ftp.gnu.org/gnu/gcl/gcl-2.6.7.tar.gz";
-  
-  
-}
diff --git a/pkgs/development/compilers/gcl/src-info-for-default.nix b/pkgs/development/compilers/gcl/src-info-for-default.nix
deleted file mode 100644
index a186fdb108a..00000000000
--- a/pkgs/development/compilers/gcl/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://ftp.gnu.org/gnu/gcl/?C=M;O=D";
-  sourceRegexp = ".*[.]tar[.]gz\$";
-  baseName = "gcl";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f10a5c3cf7a..69fb913c7a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1938,11 +1938,16 @@ let
       libXrandr xproto renderproto xextproto inputproto randrproto;
   });
 
+  /*
+  Broken; fails because of unability to find its own symbols during linking
+
   gcl = builderDefsPackage ../development/compilers/gcl {
     inherit mpfr m4 binutils fetchcvs emacs;
     inherit (xlibs) libX11 xproto inputproto libXi 
       libXext xextproto libXt libXaw libXmu;
+    stdenv = (overrideGCC stdenv gcc34) // {gcc = gcc33;};
   };
+  */
 
   # GHC