diff --git a/profiles/base/package.keywords/depends b/profiles/base/package.keywords/depends
index 26516c165..73fef3ec1 100644
--- a/profiles/base/package.keywords/depends
+++ b/profiles/base/package.keywords/depends
@@ -246,6 +246,7 @@
 ~net-misc/remmina-1.2.0_rc16 amd64 x86
 ~net-print/splix-2.0.0_p20130826 amd64 x86
 ~sys-apps/lm_sensors-3.4.0_p20160725 amd64 x86
+=sys-apps/memtest86+-4.20-r3 amd64 x86
 ~sys-apps/nvme-cli-1.0 amd64 x86
 ~sys-apps/pkgcore-0.9.2 amd64 x86
 ~sys-apps/s6-portable-utils-2.0.6.0 amd64 x86
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
deleted file mode 100644
index 13858ede0..000000000
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-exec tail -n +3 $0
-
-menuentry "memtest86+ 4.20" {
-	linux16 /boot/memtest86plus/memtest
-}
-
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove b/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
new file mode 100644
index 000000000..e6fe2385e
--- /dev/null
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
@@ -0,0 +1 @@
+# Calculate append=remove path=/boot/memtest86plus name=memtest.netbsd