diff --git a/src/search.c b/src/search.c
index 23dc27ea8..da7bc2961 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1760,6 +1760,9 @@ findmatchlimit(oap, initc, flags, maxtravel)
 #endif
 
     pos = curwin->w_cursor;
+#ifdef FEAT_VIRTUALEDIT
+    pos.coladd = 0;
+#endif
     linep = ml_get(pos.lnum);
 
     cpo_match = (vim_strchr(p_cpo, CPO_MATCH) != NULL);
diff --git a/src/version.c b/src/version.c
index 7ccb93153..ec2c2c000 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5,
 /**/
     4,
 /**/