diff --git a/src/eval.c b/src/eval.c
index 93d0394..ea83615 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9195,7 +9195,7 @@
 		vim_free(fresult);
 	    fresult = find_file_in_path_option(first ? fname : NULL,
 					       first ? (int)STRLEN(fname) : 0,
-					0, first, path, dir, NULL,
+					0, first, path, dir, curbuf->b_ffname,
 					dir ? (char_u *)"" : curbuf->b_p_sua);
 	    first = FALSE;
 
diff --git a/src/version.c b/src/version.c
index e223c49..dd8741d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    221,
+/**/
     220,
 /**/
     219,