diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
new file mode 100644
index 00000000000..ac2e0ec313a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
@@ -0,0 +1,19 @@
+. $stdenv/setup
+
+mkdir -p $out/bin
+
+pluginPath=
+for i in $plugins; do
+    p=$i/lib/mozilla/plugins
+    if test -e $p; then
+        pluginPath=$pluginPath${pluginPath:+:}$p
+    fi
+done
+
+cat > $out/bin/firefox <<EOF
+#! $SHELL
+export MOZ_PLUGIN_PATH=$pluginPath
+exec $firefox/bin/firefox
+EOF
+
+chmod +x $out/bin/firefox
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
new file mode 100644
index 00000000000..2e3c81d9e41
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
@@ -0,0 +1,9 @@
+{stdenv, firefox, plugins}:
+
+stdenv.mkDerivation {
+  name = firefox.name;
+
+  builder = ./builder.sh;
+
+  inherit firefox plugins;
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7b654f50b75..649c4b4f2f8 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -796,6 +796,11 @@ rec {
     inherit (xlibs) libXi;
   };
 
+  firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) {
+    inherit stdenv firefox;
+    plugins = [MPlayerPlugin];
+  };
+
   thunderbird = 
     (import ../build-support/make-symlinks) {
       inherit stdenv;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index b37755ace9e..ef7fc18f928 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -46,7 +46,7 @@ let {
     subversion
     pan
     sylpheed
-    firefox
+    firefoxWrapper
     thunderbird
     lynx
     MPlayer