5 files changed, 8 insertions, 4 deletions

diff --git a/src/distros/memtest/cfg.footer b/src/distros/memtest/cfg.footer
new file mode 100644
index 0000000..fe225c9
--- /dev/null
+++ b/src/distros/memtest/cfg.footer
@@ -0,0 +1 @@
+MENU END
diff --git a/src/distros/memtest/cfg.header b/src/distros/memtest/cfg.header
new file mode 100644
index 0000000..0c78363
--- /dev/null
+++ b/src/distros/memtest/cfg.header
@@ -0,0 +1,2 @@
+MENU BEGIN memtest
+MENU TITLE Memtest86+
diff --git a/src/distros/memtest/cfg.label b/src/distros/memtest/cfg.label
index fd3a678..97899ee 100644
--- a/src/distros/memtest/cfg.label
+++ b/src/distros/memtest/cfg.label
@@ -1,9 +1,9 @@
-label memtest
+label memtest@VERSION@
     MENU LABEL Memtest86+ @VERSION@
     TEXT HELP
     Perform memory test on system.
 
     Press [TAB] to append required boot options (i.e. console=ttyS1,115200).
     ENDTEXT
-    linux /boot/memtest/memtest.bin
+    linux /boot/memtest/memtest-@VERSION@.bin
 
diff --git a/src/distros/memtest/make.boot b/src/distros/memtest/make.boot
index c4b2630..d4d1ff4 100644
--- a/src/distros/memtest/make.boot
+++ b/src/distros/memtest/make.boot
@@ -1,8 +1,8 @@
 
-DOWNLOAD_FILES          += boot/memtest/memtest.bin
+DOWNLOAD_FILES          += boot/memtest/memtest-@VERSION@.bin
 
 
-boot/memtest/memtest.bin:
+boot/memtest/memtest-@VERSION@.bin:
         @rm -f $(@)
         @mkdir -p $$(dirname "$(@)")
         ./src/scripts/download.sh \
diff --git a/src/distros/memtest/option b/src/distros/memtest/options
index 4f3d29a..725b43d 100644
--- a/src/distros/memtest/option
+++ b/src/distros/memtest/options
@@ -1,2 +1,3 @@
 memtest               'Memtest86+'
    memtest-5.01       'Memtest86+ 5.01'
+   memtest-5.31b      'Memtest86+ 5.31b'