diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index 4f4eb64d566..34c8e2c03a1 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -19,15 +19,17 @@ long_desc="
 nostrip=yes
 noverifyrdeps=yes
 
+if [ "${xbps_machine}" = "x86_64" ]; then
+	Add_dependency build gcc-multilib
+fi
+
 do_build()
 {
-	cd ${wrksrc} && make || return 1
+	make ${makejobs}
 }
 
 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
+	vinstall memtest.bin 755 boot memtest86+
+	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
 }