diff --git a/src/tag.c b/src/tag.c
index 248280c7c..8a3c81c81 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1797,7 +1797,12 @@ line_read_in:
 	     */
 	    if (state == TS_START)
 	    {
-		if (STRNCMP(lbuf, "!_TAG_", 6) == 0)
+		/* The header ends when the line sorts below "!_TAG_".
+		 * There may be non-header items before the header though,
+		 * e.g. "!" itself. When case is folded lower case letters
+		 * sort before "_". */
+		if (STRNCMP(lbuf, "!_TAG_", 6) <= 0
+				|| (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1])))
 		{
 		    /*
 		     * Read header line.
diff --git a/src/version.c b/src/version.c
index 2f47dad7a..3f46c2329 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1202,
 /**/
     1201,
 /**/