diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
index 551b0e1c03fa..2574ecb73eec 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
@@ -3,6 +3,16 @@ source $stdenv/setup
 dontStrip=1
 dontPatchELF=1
 
+unpackPhase() {
+    tar xvzf $src;
+    for a in *; do
+	if [ -d $a ]; then
+		cd $a
+		break
+	fi
+    done
+}
+
 installPhase() {
     ensureDir $out/lib/mozilla/plugins
     cp -p libflashplayer.so $out/lib/mozilla/plugins
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 043273a635c1..c5c8414f8532 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -1,15 +1,20 @@
 {stdenv, fetchurl, zlib, alsaLib, curl}:
 
-assert stdenv.system == "i686-linux";
-
 stdenv.mkDerivation {
-  name = "flashplayer-10.0.12.36";
+  name = if (stdenv.system == "x86_64-linux") then
+      "flashplayer-10.0.22.87"
+    else
+      "flashplayer-10.0.22";
 
   builder = ./builder.sh;
   
-  src = fetchurl {
+  src = if (stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.22.87.linux-x86_64.so.tar.gz;
+    sha256 = "eac1d05aa96036819fe8f14f293a2ccc9601e1e32e08ec33e6ed9ed698e76145";
+  }
+  else fetchurl {
     url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-    sha256 = "cd3e8fbb05da4a5303f958cb627bc7f3845dd86576a96ab157effc4f0ae65e5d";
+    sha256 = "cd29f166c87fecc943e88fe951bb61c56728fab12b4bf343badafa73ea95394e";
   };
 
   inherit zlib alsaLib;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43b99a137aeb..8602a08a5934 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8776,8 +8776,7 @@ let
   wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
     inherit stdenv nameSuffix makeWrapper browser browserName;
     plugins =
-      let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true
-            && system == "i686-linux";
+      let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
       in
        ([]
         ++ lib.optional (!enableAdobeFlash) gnash