diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 53c7bb5a37..4f1d93244f 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4651,7 +4651,7 @@ ex_substitute(exarg_T *eap)
 		mch_memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
 		new_end += copy_len;
 
-		if (new_start_len - copy_len < sublen)
+		if ((int)new_start_len - copy_len < sublen)
 		    sublen = new_start_len - copy_len - 1;
 
 #ifdef FEAT_EVAL
diff --git a/src/version.c b/src/version.c
index b69c410687..c94a450d0a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1849,
 /**/
     1848,
 /**/