--- trunk/grubby/grubby.c	2012/02/18 00:52:28	1721
+++ trunk/grubby/grubby.c	2012/02/18 00:57:49	1727
@@ -874,7 +874,7 @@
 	    cfg->secondaryIndent = strdup(line->indent);
 	}
 
-	if (isEntryStart(line, cfi)) {
+	if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
 	    sawEntry = 1;
 	    if (!entry) {
 		cfg->entries = malloc(sizeof(*entry));
@@ -2961,9 +2961,10 @@
 		}
 	    } else if (tmplLine->type == LT_ECHO) {
 		    requote(tmplLine, config->cfi);
+		    static const char *prefix = "'Loading ";
 		    if (tmplLine->numElements > 1 &&
-			    strstr(tmplLine->elements[1].item, "'Loading Linux ")) {
-			char *prefix = "'Loading ";
+			    strstr(tmplLine->elements[1].item, prefix) &&
+			    masterLine->next && masterLine->next->type == LT_KERNEL) {
 			char *newTitle = malloc(strlen(prefix) +
 						strlen(newKernelTitle) + 2);