diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
index 3ea8495d7c7..80824fbb456 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, zlib, alsaLib}:
 
+assert stdenv.system == "i686-linux";
+
 (stdenv.mkDerivation {
   name = "flashplayer-9.0.31.0";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30480c02cab..977196839ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -165,6 +165,8 @@ rec {
   lowPrio = drv: drv // {
     meta = (if drv ? meta then drv.meta else {}) // {priority = "10";};
   };
+
+  optional = cond: elem: if cond then [elem] else [];
   
 
   ### STANDARD ENVIRONMENT
@@ -2959,11 +2961,11 @@ rec {
     inherit stdenv firefox;
     plugins = [
       MPlayerPlugin
-      flashplayer
     ]
+    ++ optional (system == "i686-linux") flashplayer
     # RealPlayer is disabled by default for legal reasons.
-    ++ (if getConfig ["firefox" "enableRealPlayer"] false then [RealPlayer] else [])
-    ++ (if supportsJDK then [jrePlugin] else []);
+    ++ optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
+    ++ optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin;
   };
 
   xara = import ../applications/graphics/xara {