diff --git a/src/option.c b/src/option.c
index 51e6a34..68a779f 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4628,7 +4628,7 @@
 				    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 22467d3..c3b268b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    37,
+/**/
     36,
 /**/
     35,