diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 633d08e4c66..35395fc116f 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86+-4.20";
+  name = "memtest86-4.0a";
   
   src = fetchurl {
-    url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
-    sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
+    url = http://memtest86.com/memtest86-4.0a.tar.gz;
+    sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y";
   };
 
   preBuild = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.memtest.org/;
-    description = "A tool to detect memory errors";
+    homepage = http://memtest86.com/;
+    description = "A tool to detect memory errors, to be run from a bootloader";
   };
 }
diff --git a/pkgs/tools/misc/memtest86/plus.nix b/pkgs/tools/misc/memtest86/plus.nix
new file mode 100644
index 00000000000..262811d330d
--- /dev/null
+++ b/pkgs/tools/misc/memtest86/plus.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "memtest86+-4.20";
+  
+  src = fetchurl {
+    url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
+    sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
+  };
+
+  preBuild = ''
+    # Really dirty hack to get Memtest to build without needing a Glibc
+    # with 32-bit libraries and headers.
+    if test "$system" = x86_64-linux; then
+        mkdir gnu
+        touch gnu/stubs-32.h
+    fi
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I.";
+  
+  installPhase = ''
+    mkdir -p $out
+    cp memtest.bin $out/
+  '';
+
+  meta = {
+    homepage = http://www.memtest.org/;
+    description = "A tool to detect memory errors, fork from memtest86";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7c4ca2ceee..f8f780c35eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -985,6 +985,8 @@ let
 
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
+  memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { };
+
   mc = callPackage ../tools/misc/mc { };
 
   mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };