diff --git a/rules/memtest86+/default.bash b/rules/memtest86+/default.bash
new file mode 100644
index 0000000..26124b6
--- /dev/null
+++ b/rules/memtest86+/default.bash
@@ -0,0 +1,32 @@
+version=\
+(
+    "5.01"
+)
+
+url=\
+(
+    "http://www.lsts.pt/glued/memtest86+-$version.tar.gz"
+)
+
+md5=\
+(
+    "035b85f2edabc9b4a6b0cf6c9c3acf50"
+)
+
+maintainer=\
+(
+    'Tiago Sá Marques <tsmarques@fe.up.pt>'
+)
+
+build()
+{
+    $cmd_make \
+        CC=$cmd_target_cc \
+        CXX=$cmd_target_cxx
+}
+
+target_install()
+{
+    $cmd_cp ./memtest.bin $cfg_dir_rootfs/boot/
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+}
diff --git a/rules/memtest86+/fs/usr/bin/start-memtest b/rules/memtest86+/fs/usr/bin/start-memtest
new file mode 100644
index 0000000..e11e2e1
--- /dev/null
+++ b/rules/memtest86+/fs/usr/bin/start-memtest
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+echo "Starting memtest in 10 seconds (requires reboot), Ctrl-C to cancel..."
+for r in 0 1 2 3 4 5 6 7 8 9; do
+    printf "."
+    sleep 1
+done
+
+mount -o remount,rw /
+extlinux -o "memtest" /boot/extlinux/
+mount -o remount,ro /
+
+echo "* Rebooting now"
+reboot
diff --git a/rules/syslinux/extlinux.conf b/rules/syslinux/extlinux.conf
index a7f6aeb..2092f90 100644
--- a/rules/syslinux/extlinux.conf
+++ b/rules/syslinux/extlinux.conf
@@ -1,3 +1,6 @@
 LABEL linux
    KERNEL /boot/kernel
    APPEND rootwait root=$cfg_kernel_boot_dev rootfstype=ext2 ro $cfg_kernel_extra_args
+
+LABEL memtest
+   LINUX /boot/memtest.bin
\ No newline at end of file
diff --git a/systems/lctr-a6xx/config b/systems/lctr-a6xx/config
index 83ed805..7031424 100644
--- a/systems/lctr-a6xx/config
+++ b/systems/lctr-a6xx/config
@@ -4,7 +4,7 @@ cfg_services0='dropbear network storage upgrade syslog escc ptpd setserial'
 cfg_services1=''
 cfg_services2='dune'
 cfg_modules=''
-cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2'
+cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2 memtest86+'
 cfg_terminal='ttyS0'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_ptpd_master='true'