diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ede122cc8a..3c2690a849 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4885,7 +4885,8 @@ do_sub(eap)
 			    ++line2;
 			    /* move the cursor to the new line, like Vi */
 			    ++curwin->w_cursor.lnum;
-			    STRCPY(new_start, p1 + 1);	/* copy the rest */
+			    /* copy the rest */
+			    mch_memmove(new_start, p1 + 1, STRLEN(p1 + 1) + 1);
 			    p1 = new_start - 1;
 			}
 		    }
diff --git a/src/version.c b/src/version.c
index 3661a8bebe..e044725a38 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 */
+/**/
+    159,
 /**/
     158,
 /**/