diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b338ed5ff4..657742e5a2 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3465,7 +3465,8 @@ set_one_cmd_context(xp, buff)
 	case CMD_find:
 	case CMD_sfind:
 	case CMD_tabfind:
-	    xp->xp_context = EXPAND_FILES_IN_PATH;
+	    if (xp->xp_context == EXPAND_FILES)
+		xp->xp_context = EXPAND_FILES_IN_PATH;
 	    break;
 	case CMD_cd:
 	case CMD_chdir:
diff --git a/src/version.c b/src/version.c
index 76d3d9e26c..34d5b49ae4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2,
 /**/
     1,
 /**/