diff --git a/src/tag.c b/src/tag.c
index 7d79e80..1352f20 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3854,6 +3854,8 @@
 			    /* Skip field without colon. */
 			    while (*p != NUL && *p >= ' ')
 				++p;
+			if (*p == NUL)
+			    break;
 		    }
 		}
 	    }
diff --git a/src/version.c b/src/version.c
index 95d6d54..d8a008d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    6,
+/**/
     5,
 /**/
     4,