diff --git a/src/search.c b/src/search.c
index a4ec444..ff4f419 100644
--- a/src/search.c
+++ b/src/search.c
@@ -793,7 +793,6 @@
 		    if (dir == FORWARD && at_first_line)
 		    {
 			match_ok = TRUE;
-			matchcol = col;
 
 			/*
 			 * When the match starts in a next line it's certainly
@@ -840,8 +839,9 @@
 			    else
 			    {
 				// Advance "matchcol" to the next character.
-				// This does not use matchpos.col, because
-				// "\zs" may have have set it.
+				// This uses rmm_matchcol, the actual start of
+				// the match, ignoring "\zs".
+				matchcol = regmatch.rmm_matchcol;
 				if (ptr[matchcol] != NUL)
 				{
 				    if (has_mbyte)
diff --git a/src/version.c b/src/version.c
index 758c4b5..d16ff10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    953,
+/**/
     952,
 /**/
     951,