diff --git a/system/boot/memtest86/actions.py b/system/boot/memtest86/actions.py
new file mode 100644
index 0000000000..aa6d6a3519
--- /dev/null
+++ b/system/boot/memtest86/actions.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
+
+WorkDir = "%s+-%s" % (get.srcNAME(), get.srcVERSION())
+docompile = False if get.ARCH() == "x86_64" else True
+
+def setup():
+ pisitools.dosed("memtest.lds", "0x5000", "0x100000")
+
+def build():
+ if docompile:
+ autotools.make()
+
+def install():
+ if docompile:
+ finalbin = "memtest.bin"
+ else:
+ finalbin = "precomp.bin"
+
+ pisitools.insinto("/boot", finalbin, "memtest")
+
+ pisitools.dodoc("FAQ", "README*")
+
diff --git a/system/boot/memtest86/files/linkonce.patch b/system/boot/memtest86/files/linkonce.patch
new file mode 100644
index 0000000000..561df2b66d
--- /dev/null
+++ b/system/boot/memtest86/files/linkonce.patch
@@ -0,0 +1,11 @@
+diff -ur memtest86+-1.70.orig/memtest_shared.lds memtest86+-1.70/memtest_shared.lds
+--- memtest86+-1.70.orig/memtest_shared.lds 2006-12-27 02:33:06.000000000 +0100
++++ memtest86+-1.70/memtest_shared.lds 2007-01-25 16:34:19.000000000 +0100
+@@ -8,6 +8,7 @@
+ _start = .;
+ *(.text)
+ *(.text.*)
++ *(.gnu.linkonce.t.*)
+ *(.plt)
+ _etext = . ;
+ } = 0x9090
diff --git a/system/boot/memtest86/files/no-hardcoded-cc.patch b/system/boot/memtest86/files/no-hardcoded-cc.patch
new file mode 100644
index 0000000000..ed0705c615
--- /dev/null
+++ b/system/boot/memtest86/files/no-hardcoded-cc.patch
@@ -0,0 +1,30 @@
+diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
+--- memtest86+-4.10-orig/Makefile 2010-06-24 00:27:22.864634431 +0200
++++ memtest86+-4.10/Makefile 2010-06-24 00:28:42.402478590 +0200
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
+
+-AS=as -32
+-CC=gcc
+-
+-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
++CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
++CPPFLAGS=-m32
++ASFLAGS=-32
+
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+ config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
+@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
+ memtest_shared.bin -o memtest.bin
+
+ reloc.o: reloc.c
+- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
++ $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
+
+ test.o: test.c
+- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
++ $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
+
+ clean:
+ rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/system/boot/memtest86/pspec.xml b/system/boot/memtest86/pspec.xml
new file mode 100644
index 0000000000..f0d39e23be
--- /dev/null
+++ b/system/boot/memtest86/pspec.xml
@@ -0,0 +1,62 @@
+
+
+
+
+ memtest86
+ http://www.memtest.org/
+
+ PisiLinux Community
+ admins@pisilinux.org
+
+ GPLv2
+ app:console
+ Memory tester
+ Memory tester for x86 and x86_64 devices for x86 and 64bit x86 compatible computers. It should be started from boot menu.
+ http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
+
+
+
+
+
+
+
+
+
+ memtest86
+
+ /boot
+ /usr/share/doc
+
+
+
+
+
+ 2015-01-27
+ 5.01
+ Version bump.
+ Stefan Gronewold(groni)
+ groni@pisilinux.org
+
+
+ 2014-06-14
+ 4.20
+ Release bump.
+ Alihan Öztürk
+ alihan@pisilinux.org
+
+
+ 2014-03-10
+ 4.20
+ Rebuild
+ Varol Maksutoğlu
+ waroi@pisilinux.org
+
+
+ 2012-09-24
+ 4.20
+ First release
+ Erdem Artan
+ admins@pisilinux.org
+
+
+
diff --git a/system/boot/memtest86/translations.xml b/system/boot/memtest86/translations.xml
new file mode 100644
index 0000000000..a921e183fe
--- /dev/null
+++ b/system/boot/memtest86/translations.xml
@@ -0,0 +1,9 @@
+
+
+
+ memtest86
+ Bellek test edici
+ x86 ve 64bit x86 mimarilerindeki bilgisayarın belleklerini test etmeye ve hataları bulmaya yaran bir program. Kullanmak için açılış menüsünden çalıştırmanız gerekmektedir.
+ Testeur de mémoire pour architecture x86 et x86_64 pour ordinateurs x86 et 64 bit x86 compatibles. Il doit être lancer depuis le menu de démarrage.
+
+