diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index 4053599cc3b9..97b9115b756d 100644
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ b/pkgs/development/interpreters/spidermonkey/default.nix
@@ -1,11 +1,20 @@
-{stdenv, fetchurl}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "spidermonkey-1.5";
+stdenv.mkDerivation rec {
+  name = "spidermonkey-1.7";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/js-1.5.tar.gz;
-    md5 = "863bb6462f4ce535399a7c6276ae6776";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz;
+	sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
   };
 
-  builder = ./builder.sh;
+  buildInputs = [ readline ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/src";
+
+  makefileExtra = ./Makefile.extra;
+  makefile = "Makefile.ref";
+  patchPhase = "cat ${makefileExtra} >> ${makefile};
+  sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}";
+
+  makeFlags="-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ef3311dc80d..d6f970051b5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1236,9 +1236,7 @@ rec {
   };
 
   spidermonkey = import ../development/interpreters/spidermonkey {
-    inherit fetchurl;
-    # remove when the "internal compiler error" in gcc 4.1.x is fixed
-    stdenv = overrideGCC stdenv gcc34;
+    inherit fetchurl stdenv readline;
   };
 
   sysPerl = import ../development/interpreters/sys-perl {