diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 0b46a1b..bfed175 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -45,7 +45,8 @@ kernel-modules-extra
 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
 # for now.
-memtest86+
+#memtest86+
+@x86-baremetal-tools # memtest86+ is included
 
 # The point of a live image is to install
 anaconda
@@ -58,7 +59,7 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-syslinux
+# syslinux is in @x86-baremetal-tools
 
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks