diff --git a/src/libostree/ostree-bootloader-syslinux.c b/src/libostree/ostree-bootloader-syslinux.c
index 54ed8203c0..d7d9c7fc3b 100644
--- a/src/libostree/ostree-bootloader-syslinux.c
+++ b/src/libostree/ostree-bootloader-syslinux.c
@@ -92,12 +92,13 @@ append_config_from_loader_entries (OstreeBootloaderSyslinux  *self,
       if (regenerate_default && i == 0)
         g_ptr_array_add (new_lines, g_strdup_printf ("DEFAULT %s", val));
 
-      g_ptr_array_add (new_lines, g_strdup_printf ("LABEL %s", val));
+      g_ptr_array_add (new_lines, g_strdup_printf ("\nLABEL %s", val));
+      g_ptr_array_add (new_lines, g_strdup_printf ("\tMENU LABEL %s", val));
 
       val = ostree_bootconfig_parser_get (config, "linux");
       if (!val)
         return glnx_throw (error, "No \"linux\" key in bootloader config");
-      g_ptr_array_add (new_lines, g_strdup_printf ("\tKERNEL /boot%s", val));
+      g_ptr_array_add (new_lines, g_strdup_printf ("\tLINUX /boot%s", val));
 
       val = ostree_bootconfig_parser_get (config, "initrd");
       if (val)
@@ -207,6 +208,11 @@ _ostree_bootloader_syslinux_write_config (OstreeBootloader  *bootloader,
           g_free (kernel_arg);
           kernel_arg = g_strdup (line + strlen ("\tKERNEL "));
         }
+      else if (parsing_label && g_str_has_prefix (line, "\tLINUX "))
+        {
+          g_free (kernel_arg);
+          kernel_arg = g_strdup (line + strlen ("\tLINUX "));
+        }
       else if (!parsing_label &&
                (g_str_has_prefix (line, "DEFAULT ")))
         {
diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py
index b5a0206644..52effd476a 100755
--- a/tests/bootloader-entries-crosscheck.py
+++ b/tests/bootloader-entries-crosscheck.py
@@ -88,6 +88,8 @@ def validate_syslinux(sysroot):
                 syslinux_entry['title'] = v
             elif k == 'KERNEL':
                 syslinux_entry['linux'] = v
+            elif k == 'LINUX':
+                syslinux_entry['linux'] = v
             elif k == 'INITRD':
                 syslinux_entry['initrd'] = v
             elif k == 'APPEND':