diff --git a/src/edit.c b/src/edit.c
index 98737ece65..b2b7787293 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -5187,11 +5187,13 @@ ins_complete(c)
 
 	    /* Go back to just before the first filename character. */
 	    mb_ptr_back(line, p);
-	    while (vim_isfilec(PTR2CHAR(p)) && p >= line)
+	    while (p > line && vim_isfilec(PTR2CHAR(p)))
 		mb_ptr_back(line, p);
-	    startcol = (int)(p - line);
+	    startcol = (int)(p - line) + 1;
+	    if (p == line && vim_isfilec(PTR2CHAR(p)))
+		startcol = 0;
 
-	    compl_col += ++startcol;
+	    compl_col += startcol;
 	    compl_length = (int)curs_col - startcol;
 	    compl_pattern = addstar(line + compl_col, compl_length,
 								EXPAND_FILES);
diff --git a/src/version.c b/src/version.c
index 9731f70c79..ff4e3bb6fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    25,
 /**/
     24,
 /**/