diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c2dc267646..02d5b3ebe8 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5059,6 +5059,7 @@ skip:
 
 	    if (did_sub)
 		++sub_nlines;
+	    vim_free(new_start);	/* for when substitute was cancelled */
 	    vim_free(sub_firstline);	/* free the copy of the original line */
 	    sub_firstline = NULL;
 	}
diff --git a/src/version.c b/src/version.c
index c3803a1038..ccc1c0edb4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    18,
 /**/
     17,
 /**/