diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
index 6abbf1a760ba..4e2f1c5e8f13 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
@@ -1,7 +1,7 @@
 source $stdenv/setup
 source $makeWrapper
 
-makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \
+makeWrapper "$firefox/bin/firefox" "$out/bin/firefox$nameSuffix" \
     --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
     --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \
     --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
index 7229f510829c..0b1756f21f23 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, firefox, plugins}:
+args: with args;
 
 stdenv.mkDerivation {
   name = firefox.name + "-with-plugins";
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
 
   inherit firefox;
 
+  nameSuffix = (if args ? nameSuffix then args.nameSuffix else "");
+
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37ba6cb3a5c7..e060e0973b63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3557,7 +3557,7 @@ rec {
     #enableOfficialBranding = true;
   });
 
-  firefoxWrapper = wrapFirefox firefox;
+  firefoxWrapper = wrapFirefox firefox "";
 
   firefox3b1 = lowPrio (import ../applications/networking/browsers/firefox3b1 {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
@@ -3568,7 +3568,7 @@ rec {
     #enableOfficialBranding = true;
   });
 
-  firefox3b1Wrapper = wrapFirefox firefox3b1;
+  firefox3b1Wrapper = wrapFirefox firefox3b1 "";
  
   flac = import ../applications/audio/flac {
     inherit fetchurl stdenv libogg;
@@ -4088,8 +4088,8 @@ rec {
     includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
   };
 
-  wrapFirefox = firefox: import ../applications/networking/browsers/firefox-wrapper {
-    inherit stdenv firefox;
+  wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
+    inherit stdenv firefox nameSuffix;
     plugins = []
     ++ lib.optional (system == "i686-linux") flashplayer
     # RealPlayer is disabled by default for legal reasons.