diff --git a/src/evalfunc.c b/src/evalfunc.c
index a4d6ebf648..228b71ad5c 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5460,7 +5460,7 @@ f_getmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
 	    for (i = 0; i < MAXPOSMATCH; ++i)
 	    {
 		llpos_T	*llpos;
-		char	buf[6];
+		char	buf[30];  // use 30 to avoid compiler warning
 		list_T	*l;
 
 		llpos = &cur->pos.pos[i];
@@ -11502,7 +11502,7 @@ f_setmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
 	while (li != NULL)
 	{
 	    int		i = 0;
-	    char_u	buf[5];
+	    char	buf[30];  // use 30 to avoid compiler warning
 	    dictitem_T  *di;
 	    char_u	*group;
 	    int		priority;
diff --git a/src/syntax.c b/src/syntax.c
index df351a31a4..7545165a0b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -10014,7 +10014,7 @@ highlight_changed(void)
     char_u	*end;
     int		id;
 #ifdef USER_HIGHLIGHT
-    char_u      userhl[10];
+    char_u      userhl[30];  // use 30 to avoid compiler warning
 # ifdef FEAT_STL_OPT
     int		id_S = -1;
     int		id_SNC = 0;
diff --git a/src/version.c b/src/version.c
index ccf68f8ecf..d024265aaf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1209,
 /**/
     1208,
 /**/