diff --git a/pkgs/applications/networking/browsers/firefox/3.0.nix b/pkgs/applications/networking/browsers/firefox/3.0.nix
index 1251707f16d7..bc5c987cd191 100644
--- a/pkgs/applications/networking/browsers/firefox/3.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.0.nix
@@ -1,69 +1,130 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2
-, freetype, fontconfig, xulrunner
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file
 
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Deer Park", enable this option.  However, those binaries may
   # not be distributed without permission from the Mozilla Foundation,
   # see http://www.mozilla.org/foundation/trademarks/.
   enableOfficialBranding ? false
-    
 }:
 
-stdenv.mkDerivation rec {
-  name = "firefox-${version}";
-  
-  version = "3.0.11";
+rec {
 
+  firefoxVersion = "3.0.11";
+  
+  xulVersion = "1.9.0.11"; # this attribute is used by other packages
+
+  
   src = fetchurl {
-    # Don't forget to update xulrunner.nix as well!
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}-source.tar.bz2";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}-source.tar.bz2";
     sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3";
   };
 
-  buildInputs = [
-    pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2
-    python dbus dbus_glib pango freetype fontconfig
-  ];
 
-  propagatedBuildInputs = [xulrunner];
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      # "--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
+      "--disable-crashreporter"
+    ];
 
-  configureFlags = [
-    "--enable-application=browser"
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-strip"
-    "--with-system-jpeg"
-    "--with-system-zlib"
-    "--with-system-bz2"
-    # "--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
-    "--disable-crashreporter"
-    "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-  ];
 
-  postInstall = ''
-    # Strip some more stuff.
-    strip -S $out/lib/*/* || true
-
-    libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
-    test -n "$libDir"
+  xulrunner = stdenv.mkDerivation {
+    name = "xulrunner-${xulVersion}";
     
-    ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
+    inherit src;
 
-    # Register extensions etc. !!! is this needed anymore?
-    echo "running firefox -register..."
-    $out/bin/firefox -register
-  ''; # */
+    buildInputs =
+      [ 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
+      ];
 
-  meta = {
-    description = "Mozilla Firefox - the browser, reloaded";
-    homepage = http://www.mozilla.com/en-US/firefox/;
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    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)" \
+          --replace /bin/ls "$(type -tP ls)"
+
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      mv xulrunner ../lib/$libDir/
+
+      for i in $out/lib/$libDir/*; do 
+          file $i;
+          if file $i | grep executable &>/dev/null; then 
+              ln -s $i $out/bin
+          fi;
+      done;
+      rm $out/bin/run-mozilla.sh || true
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
   };
 
-  passthru = {
-    inherit gtk;
-    isFirefox3Like = true;
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-3.0.11";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    postInstall = ''
+      libDir=$(cd $out/lib && ls -d firefox-[0-9]*)
+      test -n "$libDir"
+
+      ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner
+
+      # Register extensions etc. !!! is this needed anymore?
+      echo "running firefox -register..."
+      $out/bin/firefox -register
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = {
+      inherit gtk;
+      isFirefox3Like = true;
+    };
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox/xulrunner.nix b/pkgs/applications/networking/browsers/firefox/xulrunner.nix
deleted file mode 100644
index 3b345fe84df1..000000000000
--- a/pkgs/applications/networking/browsers/firefox/xulrunner.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Deer Park", enable this option.  However, those binaries may
-  # not be distributed without permission from the Mozilla Foundation,
-  # see http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-let
-
-  version = "1.9.0.11"; # this attribute is used by other packages
-
-in  
-
-stdenv.mkDerivation {
-  name = "xulrunner-${version}";
-
-  src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/source/firefox-3.0.11-source.tar.bz2;
-    sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3";
-  };
-
-  buildInputs = [
-    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
-  ];
-
-  configureFlags = [
-    "--enable-application=xulrunner"
-    "--disable-javaxpcom"
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-strip"
-    "--with-system-jpeg"
-    "--with-system-zlib"
-    "--with-system-bz2"
-    # "--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
-    "--disable-crashreporter"
-  ];
-
-  installFlags = [
-    "SKIP_GRE_REGISTRATION=1"
-  ];
-
-  postInstall = ''
-    export dontPatchELF=1;
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # Fix some references to /bin paths in the Firefox shell script.
-    substituteInPlace $out/bin/xulrunner \
-        --replace /bin/pwd "$(type -tP pwd)" \
-        --replace /bin/ls "$(type -tP ls)"
-    
-    # Fix run-mozilla.sh search
-    libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-    echo libDir: $libDir
-    test -n "$libDir"
-    cd $out/bin
-    mv xulrunner ../lib/$libDir/
-
-    for i in $out/lib/$libDir/*; do 
-        file $i;
-        if file $i | grep executable &>/dev/null; then 
-	    ln -s $i $out/bin
-        fi;
-    done;
-    rm $out/bin/run-mozilla.sh || true
-  ''; # */
-
-  meta = {
-    description = "Mozilla Firefox XUL runner";
-    homepage = http://www.mozilla.com/en-US/firefox/;
-  };
-
-  passthru = { inherit gtk version; };
-}
-
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9801a94ddb91..9b9661146074 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6255,21 +6255,11 @@ let
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
     inherit (xlibs) libXi;
-    #enableOfficialBranding = true;
   });
 
   firefox2Wrapper = wrapFirefox firefox2 "firefox" "";
 
-  firefox3 = lowPrio (import ../applications/networking/browsers/firefox/3.0.nix {
-    inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo
-      python dbus dbus_glib freetype fontconfig bzip2;
-    inherit (gtkLibs) gtk pango;
-    inherit (gnome) libIDL;
-    #enableOfficialBranding = true;
-    xulrunner = xulrunner3;
-  });
-
-  xulrunner3 = lowPrio (import ../applications/networking/browsers/firefox/xulrunner.nix {
+  firefox3Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.0.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs file;
     inherit (gtkLibs) gtk pango;
@@ -6277,13 +6267,16 @@ let
     #enableOfficialBranding = true;
   });
 
+  firefox3 = firefox3Pkgs.firefox;
+
+  xulrunner3 = firefox3Pkgs.xulrunner;
+
   firefox3_5 = lowPrio (import ../applications/networking/browsers/firefox/3.5.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2;
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
     inherit alsaLib;
-    #enableOfficialBranding = true;
     xulrunner = xulrunner3_5;
     autoconf = autoconf213;
   });
@@ -6295,7 +6288,6 @@ let
     inherit (gnome) libIDL;
     inherit alsaLib;
     autoconf = autoconf213;
-    #enableOfficialBranding = true;
   });
 
   firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox/binary.nix {