diff --git a/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix b/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix
index d7ee36da900..b1a6e81f927 100644
--- a/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix
+++ b/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix
@@ -5,11 +5,11 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "b9c90bb4";
+  version = "7471c95f23";
   src = fetchgit {
     url = git://github.com/ghcjs/cabal.git;
-    rev = "b9c90bb4d6fed8c2cc8323a7e24b67f821c1ee47"; # Must be from the ghcjs branch
-    sha256 = "d678d8c54d82db8b4fb0d7dc72c4832025c69586da8c0f65f6d05f6f50103c62";
+    rev = "7471c95f230170342bbdc7bcb8881d5d06145f95"; # Must be from the ghcjs branch
+    sha256 = "a4bbb0db43d25d73f78760ca4aa1431bf00b6dd1c43483e9b659f8b13ef9ebfc";
   };
   preConfigure = "cd Cabal";
   configureFlags = "--program-suffix=-js";
diff --git a/pkgs/development/tools/haskell/ghcjs/default.nix b/pkgs/development/tools/haskell/ghcjs/default.nix
index f757e63d176..dcd5356d261 100644
--- a/pkgs/development/tools/haskell/ghcjs/default.nix
+++ b/pkgs/development/tools/haskell/ghcjs/default.nix
@@ -66,12 +66,12 @@ cabal.mkDerivation (self: rec {
     export GIT_SSL_CAINFO="${cacert}/etc/ca-bundle.crt"
     git clone git://github.com/ghcjs/ghcjs-boot.git
     cd ghcjs-boot
-    git checkout f5e57f9d4d8241a78ebdbdb34262921782a27e1a
+    git checkout 8bf2861c0c776eec42e0a1833f220e36681e810c
     git submodule update --init --recursive
     ( cd boot ; chmod u+w . ; ln -s .. ghcjs-boot )
     chmod -R u+w .              # because fetchgit made it read-only
     local GHCJS_LIBDIR=$out${libdir}
-    ensureDir $GHCJS_LIBDIR
+    mkdir -p $GHCJS_LIBDIR
     cp -R ${shims} $GHCJS_LIBDIR/shims
     ${cabalInstallGhcjs}/bin/cabal-js update
     PATH=$out/bin:${CabalGhcjs}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.gcc}/lib64:$LD_LIBRARY_PATH \