diff --git a/src/buffer.c b/src/buffer.c
index 34273d8..7b02dda 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4062,7 +4062,8 @@
 		item[curitem].minwid = -syn_namen2id(t, (int)(s - t));
 		curitem++;
 	    }
-	    ++s;
+	    if (*s != NUL)
+		++s;
 	    continue;
 	}
 
diff --git a/src/version.c b/src/version.c
index 1e4766a..c221725 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    54,
+/**/
     53,
 /**/
     52,