diff --git a/src/libostree/ostree-bootloader-syslinux.c b/src/libostree/ostree-bootloader-syslinux.c
index 0055896bd9..d7d9c7fc3b 100644
--- a/src/libostree/ostree-bootloader-syslinux.c
+++ b/src/libostree/ostree-bootloader-syslinux.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 static const char syslinux_config_path[] = "boot/syslinux/syslinux.cfg";
+static const char extlinux_config_path[] = "boot/extlinux/extlinux.conf";
 
 struct _OstreeBootloaderSyslinux
 {
@@ -51,6 +52,13 @@ _ostree_bootloader_syslinux_query (OstreeBootloader *bootloader,
 
   if (!glnx_fstatat_allow_noent (self->sysroot->sysroot_fd, syslinux_config_path, &stbuf, AT_SYMLINK_NOFOLLOW, error))
     return FALSE;
+  if (errno == 0)
+    {
+      *out_is_active = TRUE;
+      return TRUE;
+    }
+  if (!glnx_fstatat_allow_noent (self->sysroot->sysroot_fd, extlinux_config_path, &stbuf, AT_SYMLINK_NOFOLLOW, error))
+    return FALSE;
   *out_is_active = (errno == 0);
   return TRUE;
 }
@@ -84,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)
@@ -124,7 +133,19 @@ _ostree_bootloader_syslinux_write_config (OstreeBootloader  *bootloader,
     glnx_file_get_contents_utf8_at (self->sysroot->sysroot_fd, syslinux_config_path, NULL,
                                     cancellable, error);
   if (!config_contents)
-    return FALSE;
+    {
+      if (errno != ENOENT)
+        return FALSE;
+      else
+        {
+          g_clear_error (error);
+          config_contents =
+            glnx_file_get_contents_utf8_at (self->sysroot->sysroot_fd, extlinux_config_path, NULL,
+                                            cancellable, error);
+          if (!config_contents)
+            return FALSE;
+        }
+    }
 
   g_auto(GStrv) lines = g_strsplit (config_contents, "\n", -1);
   g_autoptr(GPtrArray) new_lines = g_ptr_array_new_with_free_func (g_free);
@@ -187,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':