2 files changed, 5 insertions, 3 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b35f1c6..8503cb2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,8 @@ Changelog
 Added
 -----
 
+- Added classes for Memtest86+ and UEFI Shell menuentries.
+
 Changed
 -------
 
diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg
index 5ea764d..034bdb4 100644
--- a/configs/releng/grub/grub.cfg
+++ b/configs/releng/grub/grub.cfg
@@ -56,16 +56,16 @@ menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)"
 
 if [ "${grub_platform}" == "efi" ]; then
     if [ "${grub_cpu}" == "x86_64" ]; then
-        menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
+        menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class memtest --class gnu --class tool {
             set gfxpayload=800x600,1024x768
             linux /boot/memtest86+/memtest.efi
         }
-        menuentry "UEFI Shell" {
+        menuentry "UEFI Shell" --class efi {
             insmod chain
             chainloader /shellx64.efi
         }
     elif [ "${grub_cpu}" == "i386" ]; then
-        menuentry "UEFI Shell" {
+        menuentry "UEFI Shell" --class efi {
             insmod chain
             chainloader /shellia32.efi
         }