diff --git a/src/option.c b/src/option.c
index 51e6a34ea8..68a779fd03 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4628,7 +4628,7 @@ do_set(arg, opt_flags)
 				    if ((!(flags & P_COMMA) || *s != ',')
 					    && vim_strchr(s + 1, *s) != NULL)
 				    {
-					STRCPY(s, s + 1);
+					mch_memmove(s, s + 1, STRLEN(s));
 					--s;
 				    }
 			    }
diff --git a/src/version.c b/src/version.c
index 22467d3583..c3b268bee5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    37,
 /**/
     36,
 /**/