diff --git a/package/memtest86/Config.in b/package/memtest86/Config.in
index c9a8cf749f..3883176efb 100644
--- a/package/memtest86/Config.in
+++ b/package/memtest86/Config.in
@@ -30,17 +30,17 @@ config BR2_PACKAGE_MEMTEST86
 	  line:
 
 	  menuentry "Start Memtest86+ (USB keyboards)" {
-	      linux16 /boot/memtest.bin keyboard=both
+	      linux16 /boot/mt86plus keyboard=both
 	  }
 	  menuentry "Start Memtest86+ (serial line)" {
-	      linux16 /boot/memtest.bin console=ttyS0,115200
+	      linux16 /boot/mt86plus console=ttyS0,115200
 	  }
 
 	  Or for UEFI BIOS using the Linux 32-bit or 64-bit boot
 	  protocols, using USB keyboard:
 
 	  menuentry "Start Memtest86+ (USB keyboards)" {
-	      linux /EFI/BOOT/memtest.efi keyboard=both
+	      linux /EFI/BOOT/mt86plus keyboard=both
 	  }
 
 	  Other boot loaders will have similar requirements.
diff --git a/package/memtest86/memtest86.hash b/package/memtest86/memtest86.hash
index 20d96dce95..109e9f3761 100644
--- a/package/memtest86/memtest86.hash
+++ b/package/memtest86/memtest86.hash
@@ -1,3 +1,3 @@
 # locally computed using sha256sum
-sha256  8bad4b5788bc28e4dd1db78c9069bd0c65a4a6baf16409ab537c795bb04578b3  memtest86-7.20.tar.gz
+sha256  ec7edde55f60d12d9e7bc1cc560837cdbaa14cf00020cebb4a1d7fe4afeddb4a  memtest86-8.00.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE
diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk
index 4f9c1b9a28..30336a3dc5 100644
--- a/package/memtest86/memtest86.mk
+++ b/package/memtest86/memtest86.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEMTEST86_VERSION = 7.20
+MEMTEST86_VERSION = 8.00
 MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION))
 MEMTEST86_LICENSE = GPL-2.0
 MEMTEST86_LICENSE_FILES = LICENSE
@@ -12,10 +12,10 @@ MEMTEST86_INSTALL_IMAGES = YES
 MEMTEST86_INSTALL_TARGET = NO
 
 ifeq ($(BR2_i386),y)
-MEMTEST86_BUILD_DIR = build32
+MEMTEST86_BUILD_DIR = build/i586
 else
 ifeq ($(BR2_x86_64),y)
-MEMTEST86_BUILD_DIR = build64
+MEMTEST86_BUILD_DIR = build/x86_64
 endif
 endif
 
@@ -24,10 +24,8 @@ define MEMTEST86_BUILD_CMDS
 endef
 
 define MEMTEST86_INSTALL_IMAGES_CMDS
-	$(foreach ext, bin efi, \
-		$(INSTALL) -m 0755 -D $(@D)/$(MEMTEST86_BUILD_DIR)/memtest.$(ext) \
-			$(BINARIES_DIR)/memtest.$(ext)
-	)
+	$(INSTALL) -m 0755 -D $(@D)/$(MEMTEST86_BUILD_DIR)/mt86plus \
+		$(BINARIES_DIR)/mt86plus
 endef
 
 $(eval $(generic-package))