diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 80ac3f9..ffd90a1 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4677,11 +4677,12 @@
 			/* For a multi-line match, put matchcol at the NUL at
 			 * the end of the line and set nmatch to one, so that
 			 * we continue looking for a match on the next line.
-			 * Avoids that ":s/\nB\@=//gc" get stuck. */
+			 * Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc"
+			 * get stuck when pressing 'n'. */
 			if (nmatch > 1)
 			{
 			    matchcol = (colnr_T)STRLEN(sub_firstline);
-			    nmatch = 1;
+			    skip_match = TRUE;
 			}
 			goto skip;
 		    }
diff --git a/src/version.c b/src/version.c
index 1517d0a..b248fc3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    217,
+/**/
     216,
 /**/
     215,