diff --git a/memtest86+-5.31b.bin.gz b/memtest86+-5.31b.bin.gz
deleted file mode 100644
index dffe55e..0000000
Binary files a/memtest86+-5.31b.bin.gz and /dev/null differ
diff --git a/memtest86+-grub b/memtest86+-grub
index ae86d45..1280c0f 100644
--- a/memtest86+-grub
+++ b/memtest86+-grub
@@ -17,7 +17,7 @@ esac
 prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
 
 if test -e /boot/memtest86+.bin ; then
-  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
+  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+/memtest86+.bin" )
   echo "Found memtest86+ image: $MEMTESTPATH" >&2
   cat << EOF
 menuentry "Memory test (memtest86+)" {
diff --git a/memtest86+-grub-efi b/memtest86+-grub-efi
new file mode 100644
index 0000000..357bd83
--- /dev/null
+++ b/memtest86+-grub-efi
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system.               #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+.efi"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+    ## image exists, create menu entry
+    echo "Found memtest86+ EFI image: ${MEMTEST86_IMAGE}" >&2
+    _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+    _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+    _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+    cat << EOF
+if [ "\${grub_platform}" == "efi" ]; then
+    menuentry "Memory Tester (memtest86+)" ${CLASS} {
+        if loadfont unicode ; then
+            set gfxmode=1024x768,800x600,auto
+            set gfxpayload=800x600,1024x768
+            terminal_output gfxterm
+        fi
+        search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+        linux ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+    }
+fi
+EOF
+fi
diff --git a/memtest86+.spec b/memtest86+.spec
index 25dcea0..606303c 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -1,38 +1,73 @@
 Name:          memtest86+
-Version:       5.31b
-Release:       1mamba
-Summary:       Thorough, stand alone memory test for x86 architecture computers
-Group:         System/Hardware
+Version:       6.01
+Release:       2mamba
+Summary:       Thorough, stand alone memory test for x86 architecture computers (legacy BIOS version)
+Group:         System/Kernel and Hardware
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           https://www.memtest.org/
-Source:        http://www.memtest.org/download/%{version}/memtest86+-%{version}.bin.gz
-#Source:        http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
+URL:           https://www.memtest.org
+Source:        https://github.com/memtest86plus/memtest86plus.git/v%{version}/memtest86plus-%{version}.tar.bz2
+#Source:        http://www.memtest.org/download/%{version}/memtest86+-%{version}.bin.gz
 Source1:       memtest86+-grub
+Source2:       memtest86+-grub-efi
 Patch0:        memtest86+-5.01-Makefile.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
+BuildRequires: xorriso
+BuildRequires: dosfstools
+BuildRequires: mtools
 
 %description
 Based on the well-known original memtest86 written by Chris Brady, memtest86+ is a port by some members of the x86-secret team.
 Our goal is to provide an up-to-date and completly reliable version of this software tool aimed at memory failures detection.
 
+%package efi
+Group:         System/Kernel and Hardware
+Summary:       Thorough, stand alone memory test for x86 architecture computers (EFI version)
+
+%description efi
+Thorough, stand alone memory test for x86 architecture computers (EFI version).
+
+%package iso
+Group:         System/Kernel and Hardware
+Summary:       Thorough, stand alone memory test for x86 architecture computers (ISO image)
+
+%description iso
+Thorough, stand alone memory test for x86 architecture computers (ISO image).
+
 %prep
-%setup -q -c -T
+%setup -q -n memtest86plus-%{version}
 #% patch0 -p1
 
 %build
-cp %{SOURCE0} .
-gunzip memtest86+-%{version}.bin.gz
-#% make LD=ld.bfd
+%ifarch x86_64
+cd build64
+%else
+cd build32
+%endif
+
+make
+make iso
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
-install -D memtest86+-%{version}.bin %{buildroot}/boot/memtest86+.bin
+
+%ifarch x86_64
+cd build64
+%else
+cd build32
+%endif
+
+install -D -m0644 memtest.bin %{buildroot}/boot/memtest86+.bin
 install -D %{SOURCE1} %{buildroot}%{_sysconfdir}/grub.d/20_memtest86+
 
+install -D -m0644 memtest.efi %{buildroot}/boot/memtest86+.efi
+install -D %{SOURCE2} %{buildroot}%{_sysconfdir}/grub.d/60_memtest86+-efi
+
+install -D -m0644 memtest.iso %{buildroot}%{_datadir}/memtest86+/memtest.iso
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
@@ -47,7 +82,22 @@ fi
 %{_sysconfdir}/grub.d/20_memtest86+
 /boot/memtest86+.bin
 
+%files efi
+%defattr(-,root,root)
+%{_sysconfdir}/grub.d/60_memtest86+-efi
+/boot/memtest86+.efi
+
+%files iso
+%defattr(-,root,root)
+%{_datadir}/memtest86+/memtest.iso
+
 %changelog
+* Wed Jan 04 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 6.01-2mamba
+- bios  memtest86+.bin: restore original installation path
+
+* Sun Jan 01 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 6.01-1mamba
+- update to 6.01
+
 * Mon May 03 2021 Automatic Build System <autodist@mambasoft.it> 5.31b-1mamba
 - automatic update by autodist