diff --git a/pkgs/applications/networking/browsers/firefox/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix
index e223021f3e2..2d56240e1d7 100644
--- a/pkgs/applications/networking/browsers/firefox/3.5.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.5.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr
+, freetype, fontconfig, file, alsaLib, nspr, nss
 
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Deer Park", enable this option.  However, those binaries may
@@ -30,6 +30,7 @@ rec {
       "--with-system-zlib"
       "--with-system-bz2"
       "--with-system-nspr"
+      "--with-system-nss"
       # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
       "--enable-system-cairo"
       #"--enable-system-sqlite" # <-- this seems to be discouraged
@@ -47,7 +48,7 @@ rec {
       [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr
+        alsaLib nspr nss
       ];
 
     configureFlags =
@@ -63,8 +64,6 @@ rec {
     installFlags = "SKIP_GRE_REGISTRATION=1";
 
     postInstall = ''
-      export dontPatchELF=1
-
       # Fix some references to /bin paths in the Xulrunner shell script.
       substituteInPlace $out/bin/xulrunner \
           --replace /bin/pwd "$(type -tP pwd)" \
@@ -83,7 +82,7 @@ rec {
               ln -s $i $out/bin
           fi;
       done;
-      rm $out/bin/run-mozilla.sh || true
+      rm -f $out/bin/run-mozilla.sh
     ''; # */
 
     meta = {
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 35fc60db57b..249d3bbc5e9 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,5 +1,14 @@
 {stdenv, fetchurl, nspr, perl, zlib}:
 
+let
+
+  nssConfig = fetchurl {
+    url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-libs/nss/files/3.12-nss-config.in?rev=1.2";
+    sha256 = "1ck9q68fxkjq16nflixbqi4xc6bmylmj994h3f1j42g8mp0xf0vd";
+  };
+
+in
+
 stdenv.mkDerivation {
   name = "nss-3.12.3";
   
@@ -34,10 +43,28 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      find $out -name "*.a" | xargs rm
+      #find $out -name "*.a" | xargs rm
       rm -rf $out/private
       mv $out/public $out/include
       mv $out/*.OBJ/* $out/
       rmdir $out/*.OBJ
+
+      # Borrowed from Gentoo.  Firefox expects an nss-config script,
+      # but NSS doesn't provide it.
+      
+      NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
+      NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
+      NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
+
+      cp ${nssConfig} $out/bin/nss-config
+      chmod u+x $out/bin/nss-config
+      substituteInPlace $out/bin/nss-config \
+        --subst-var-by MOD_MAJOR_VERSION $NSS_VMAJOR \
+        --subst-var-by MOD_MINOR_VERSION $NSS_VMINOR \
+        --subst-var-by MOD_PATCH_VERSION $NSS_VPATCH \
+        --subst-var-by prefix $out \
+        --subst-var-by exec_prefix $out \
+        --subst-var-by includedir $out/include/nss \
+        --subst-var-by libdir $out/lib
     ''; # */
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a759171695..d86c6e5efcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6300,11 +6300,15 @@ let
   firefox35Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.5.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs file alsaLib
-      nspr;
+      nspr nss;
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   });
 
+  firefox35 = firefox35Pkgs.firefox;
+  xulrunner35 = firefox35Pkgs.xulrunner;
+  firefox35Wrapper = wrapFirefox firefox35 "firefox" "";
+
   flac = import ../applications/audio/flac {
     inherit fetchurl stdenv libogg;
   };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index d5488948843..1a903cb40db 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -130,7 +130,7 @@ in {
   findutils = all;
   firefox2 = linux;
   firefox3 = prio 150 linux;
-  firefox3_5 = prio 15 linux;
+  firefox35 = linux;
   flex = all;
   flex2535 = all;
   fontforge = linux;