diff --git a/srcpkgs/memtest86+/files/20_memtest86+ b/srcpkgs/memtest86+/files/20_memtest86+
index 38648b365f8..5a81a556ed7 100644
--- a/srcpkgs/memtest86+/files/20_memtest86+
+++ b/srcpkgs/memtest86+/files/20_memtest86+
@@ -3,8 +3,8 @@ set -e
 
 # older versions of grub2 do not have this yet (LP: #459080)
 if [ ! -e /usr/share/grub/grub-mkconfig_lib ]; then
-    echo "no grub-mkconfig_lib, exiting"
-    exit 0
+	echo "no grub-mkconfig_lib, exiting"
+	exit 0
 fi
 
 . /usr/share/grub/grub-mkconfig_lib
@@ -15,8 +15,8 @@ else
 	MEMTESTSFX="efi"
 fi
 
-if [ -e /boot/memtest.bin ]; then
-	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.bin" )
+if [ -e /boot/memtest86+/memtest.bin ]; then
+	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+/memtest.bin" )
 	echo "Found memtest86+ image: $MEMTESTPATH" >&2
 	cat <<- EOF
 	if [ "\${grub_platform}" != "efi" ]; then
@@ -35,8 +35,8 @@ if [ -e /boot/memtest.bin ]; then
 	fi
 	EOF
 fi
-if [ -e /boot/memtest.efi ]; then
-	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest.efi" )
+if [ -e /boot/memtest86+/memtest.efi ]; then
+	MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+/memtest.efi" )
 	echo "Found memtest86+ image: $MEMTESTPATH" >&2
 	cat <<- EOF
 	if [ "\${grub_platform}" = "efi" ]; then
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index 6ca843a0fe0..e5c9bba382b 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,19 +1,21 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
-version=7.00
+version=7.20
 revision=1
 archs="i686* x86_64*"
-short_desc="Advanced Memory Diagnostic Tool - upstream binary"
+build_wrksrc="build$XBPS_TARGET_WORDSIZE"
+build_style="gnu-makefile"
+make_use_env=yes # we DON'T want our cflags to be used
+short_desc="Advanced Memory Diagnostic Tool"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="https://www.memtest.org/download/v${version}/mt86plus_${version}.binaries.zip"
-checksum=19894151788a99c25c42644696527aba18cb210b2f9bca4a60e73586a6d78286
+distfiles="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${version}.tar.gz"
+checksum=8bad4b5788bc28e4dd1db78c9069bd0c65a4a6baf16409ab537c795bb04578b3
 nostrip=yes
-noverifyrdeps=yes
 
 do_install() {
-	vinstall "memtest${XBPS_TARGET_WORDSIZE}.bin" 755 boot memtest.bin
-	vinstall "memtest${XBPS_TARGET_WORDSIZE}.efi" 755 boot memtest.efi
+	vinstall memtest.bin 755 boot/memtest86+
+	vinstall memtest.efi 755 boot/memtest86+
 	vinstall "${FILESDIR}/20_memtest86+" 755 etc/grub.d
 }