diff --git a/srcpkgs/memtest86+/INSTALL b/srcpkgs/memtest86+/INSTALL
index 881f750c82d..2394c168701 100644
--- a/srcpkgs/memtest86+/INSTALL
+++ b/srcpkgs/memtest86+/INSTALL
@@ -1,12 +1,14 @@
 # grub: follows /etc/kernel.d/post-install/50-grub actions
 case ${ACTION} in
 post)
-	RESULT=1
-	if command -v grub-mkconfig >/dev/null 2>&1; then
-		if [ -d $ROOTDIR/boot/grub ]; then
-			grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
-			RESULT=$?
-	        fi
+	RESULT=0
+	if ! command -v grub-mkconfig >/dev/null 2>&1; then
+		exit 0
+	fi
+
+	if [ -d $ROOTDIR/boot/grub ]; then
+		grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
+		RESULT=$?
 	fi
 	[ $RESULT -ne 0 ] && exit $RESULT
 	;;
diff --git a/srcpkgs/memtest86+/REMOVE b/srcpkgs/memtest86+/REMOVE
index 881f750c82d..2394c168701 100644
--- a/srcpkgs/memtest86+/REMOVE
+++ b/srcpkgs/memtest86+/REMOVE
@@ -1,12 +1,14 @@
 # grub: follows /etc/kernel.d/post-install/50-grub actions
 case ${ACTION} in
 post)
-	RESULT=1
-	if command -v grub-mkconfig >/dev/null 2>&1; then
-		if [ -d $ROOTDIR/boot/grub ]; then
-			grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
-			RESULT=$?
-	        fi
+	RESULT=0
+	if ! command -v grub-mkconfig >/dev/null 2>&1; then
+		exit 0
+	fi
+
+	if [ -d $ROOTDIR/boot/grub ]; then
+		grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
+		RESULT=$?
 	fi
 	[ $RESULT -ne 0 ] && exit $RESULT
 	;;
diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
new file mode 100644
index 00000000000..acd46c0a464
--- /dev/null
+++ b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2019-03-29 16:41:29.629879497 +0100
++++ Makefile	2019-03-29 16:41:55.351031244 +0100
+@@ -53,7 +53,7 @@
+ 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
+ 
+ test.o: test.c
+-	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
++	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
+ 
+ random.o: random.c
+ 	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index 906599db490..b2424856666 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,15 +1,15 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
 version=5.01
-revision=4
-homepage="http://www.memtest.org"
-distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz"
-short_desc="An Advanced Memory Diagnostic Tool"
+revision=5
+archs="i686 x86_64"
+short_desc="Advanced Memory Diagnostic Tool"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
+homepage="http://www.memtest.org"
+distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
 
-archs="i686 x86_64"
 nostrip=yes
 noverifyrdeps=yes