diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 2bd75af202..3d125f092e 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -5408,7 +5408,7 @@ nfa_regmatch(prog, start, submatch, m)
     regsubs_T		*m;
 {
     int		result;
-    int		size = 0;
+    size_t	size = 0;
     int		flag = 0;
     int		go_to_nextline = FALSE;
     nfa_thread_T *t;
diff --git a/src/version.c b/src/version.c
index 35a716058e..7f84aec662 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    599,
 /**/
     598,
 /**/