diff --git a/srcpkgs/memtest86+/files/20_memtest86+ b/srcpkgs/memtest86+/files/20_memtest86+
new file mode 100644
index 0000000000..b7e898eaee
--- /dev/null
+++ b/srcpkgs/memtest86+/files/20_memtest86+
@@ -0,0 +1,29 @@
+#! /bin/sh
+set -e
+
+# older versions of grub2 do not have this yet (LP: #459080)
+if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then
+    echo "no grub-mkconfig_lib, exiting"
+    exit 0
+fi
+
+. /usr/lib/grub/grub-mkconfig_lib
+
+if test -e /boot/memtest86+.bin ; then
+  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
+  echo "Found memtest86+ image: $MEMTESTPATH" >&2
+  cat << EOF
+menuentry "Memory test (memtest86+)" {
+EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+  cat << EOF
+	linux16 $MEMTESTPATH
+}
+menuentry "Memory test (memtest86+, serial console 115200)" {
+EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+  cat << EOF
+	linux16 $MEMTESTPATH console=ttyS0,115200n8
+}
+EOF
+fi
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
new file mode 100644
index 0000000000..4f4eb64d56
--- /dev/null
+++ b/srcpkgs/memtest86+/template
@@ -0,0 +1,33 @@
+# Template file for 'memtest86+'
+pkgname=memtest86+
+version=4.00
+distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz"
+build_style=custom-install
+short_desc="An Advanced Memory Diagnostic Tool"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=6ec42f549da81b715bfc5c55b93b74774fb5c35f7578c7eecebab3ca37866ca4
+long_desc="
+ Memtest86+ scans your RAM for errors.
+
+ It can output a list of bad RAM regions usable by the BadRAM kernel patch,
+ so that you can still use you old RAM with one or two bad bits.
+
+ Memtest86+ is based on memtest86 3.0, and adds support for recent hardware,
+ as well as a number of general-purpose improvements, including many patches
+ to memtest86 available from various sources."
+
+nostrip=yes
+noverifyrdeps=yes
+
+do_build()
+{
+	cd ${wrksrc} && make || return 1
+}
+
+do_install()
+{
+	install -D -m755 ${wrksrc}/memtest.bin \
+		${DESTDIR}/boot/memtest86+.bin || return 1
+	install -D -m755 ${FILESDIR}/20_memtest86+ \
+		${DESTDIR}/etc/grub.d/20_memtest86+ || return 1
+}