diff --git a/pkgs/development/libraries/gmp/5.0.3.nix b/pkgs/development/libraries/gmp/5.0.4.nix
similarity index 93%
rename from pkgs/development/libraries/gmp/5.0.3.nix
rename to pkgs/development/libraries/gmp/5.0.4.nix
index 8c3d24d2d113..01995d1d885c 100644
--- a/pkgs/development/libraries/gmp/5.0.3.nix
+++ b/pkgs/development/libraries/gmp/5.0.4.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, m4, cxx ? true }:
 
 stdenv.mkDerivation rec {
-  name = "gmp-5.0.3";
+  name = "gmp-5.0.4";
 
   src = fetchurl {
     url = "mirror://gnu/gmp/${name}.tar.bz2";
-    sha256 = "dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3";
+    sha256 = "0vx0z5f1q8jjxjp8hcbcvzz8y41zs889nna4r4ahkpsb7vgamm1m";
   };
 
+  patches = [ ./ignore-bad-cpuid.patch ];
+
   buildNativeInputs = [ m4 ];
 
   configureFlags =
diff --git a/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch b/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
new file mode 100644
index 000000000000..840d530a450b
--- /dev/null
+++ b/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
@@ -0,0 +1,31 @@
+Don't abort when seeing the default CPU model/platform returned by
+QEMU.
+
+diff -ru -x '*~' gmp-5.0.4-orig/mpn/x86_64/fat/fat.c gmp-5.0.4/mpn/x86_64/fat/fat.c
+--- gmp-5.0.4-orig/mpn/x86_64/fat/fat.c	2012-02-10 11:23:05.000000000 +0100
++++ gmp-5.0.4/mpn/x86_64/fat/fat.c	2012-04-01 21:38:35.843066724 +0200
+@@ -194,13 +194,16 @@
+     {
+       switch (family)
+ 	{
++#if 0
+ 	case 4:
+ 	case 5:
+ 	  abort ();		/* 32-bit processors */
++#endif
+ 
+ 	case 6:
+ 	  switch (model)
+ 	    {
++#if 0
+ 	    case 0x00:
+ 	    case 0x01:
+ 	    case 0x02:
+@@ -217,6 +220,7 @@
+ 	    case 0x0d:		/* Dothan */
+ 	    case 0x0e:		/* Yonah */
+ 	      abort ();		/* 32-bit processors */
++#endif
+ 
+ 	    case 0x0f:		/* Conroe Merom Kentsfield Allendale */
+ 	    case 0x10:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc24c5ec1c85..aa52aed09dee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3640,7 +3640,7 @@ let
       # GMP 4.3.2 is broken on Darwin, so use 4.3.1.
       callPackage ../development/libraries/gmp/4.3.1.nix { }
     else
-      callPackage ../development/libraries/gmp/5.0.3.nix { };
+      callPackage ../development/libraries/gmp/5.0.4.nix { };
 
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });