diff --git a/srcpkgs/memtest86+/files/20_memtest86+ b/srcpkgs/memtest86+/files/20_memtest86+
index 24f1994e99..aa9b840135 100644
--- a/srcpkgs/memtest86+/files/20_memtest86+
+++ b/srcpkgs/memtest86+/files/20_memtest86+
@@ -2,12 +2,12 @@
 set -e
 
 # older versions of grub2 do not have this yet (LP: #459080)
-if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then
+if [ ! -e /usr/share/grub/grub-mkconfig_lib ]; then
     echo "no grub-mkconfig_lib, exiting"
     exit 0
 fi
 
-. /usr/lib/grub/grub-mkconfig_lib
+. /usr/share/grub/grub-mkconfig_lib
 
 if test -e /boot/memtest86+ ; then
   MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index 78f552a410..c5e045afe7 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,7 +1,7 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
 version=4.20
-revision=1
+revision=2
 homepage="http://www.memtest.org"
 distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz"
 short_desc="An Advanced Memory Diagnostic Tool"
@@ -21,6 +21,8 @@ long_desc="
  as well as a number of general-purpose improvements, including many patches
  to memtest86 available from various sources."
 
+only_for_archs="i686 x86_64"
+
 do_build() {
 	make ${makejobs}
 }
@@ -34,7 +36,6 @@ memtest86+_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	pkg_install() {
-		vmove boot
-		vmove etc
+		vmove all
 	}
 }