diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix
index 972ded49dc5..e3c12cce8c7 100644
--- a/pkgs/development/compilers/ghc/6.8.3.nix
+++ b/pkgs/development/compilers/ghc/6.8.3.nix
@@ -1,14 +1,15 @@
 {stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses, haddock}:
 
 stdenv.mkDerivation rec {
-  name = "ghc-6.8.3";
+  version = "6.8.3";
+  name = "ghc-${version}";
   homepage = "http://www.haskell.org/ghc";
 
   src = map fetchurl [
-    { url    = "${homepage}/dist/6.8.3/${name}-src.tar.bz2";
+    { url    = "${homepage}/dist/${version}/${name}-src.tar.bz2";
       sha256 = "1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b";
     }
-    { url    = "${homepage}/dist/6.8.3/${name}-src-extralibs.tar.bz2";
+    { url    = "${homepage}/dist/${version}/${name}-src-extralibs.tar.bz2";
       sha256 = "ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2";
     }
   ];
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index d46787b8630..d76916963ba 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -17,7 +17,7 @@ attrs :
 	    # all packages with haskell- to avoid name clashes for libraries;
 	    # if that is not desired (for applications), name can be set to
 	    # fname.
-            name = "haskell-${self.fname}"; 
+            name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}"; 
 
             # the default download location for Cabal packages is Hackage,
             # you still have to specify the checksum
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8783db0b82a..69e545b3455 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1868,7 +1868,7 @@ let
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
-  haskellPackages = haskellPackages_ghc6102;
+  haskellPackages = recurseIntoAttrs haskellPackages_ghc6102;
 
   haskellPackages_ghc6102 = import ./haskell-packages.nix {
     inherit pkgs;