diff --git a/src/misc1.c b/src/misc1.c
index 96d268d49..789aad373 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -10135,6 +10135,15 @@ expand_path_option(curdir, gap)
 
 	if (ga_grow(gap, 1) == FAIL)
 	    break;
+
+# if defined(MSWIN) || defined(MSDOS)
+	/* Avoid the path ending in a backslash, it fails when a comma is
+	 * appended. */
+	len = STRLEN(buf);
+	if (buf[len - 1] == '\\')
+	    buf[len - 1] = '/';
+# endif
+
 	p = vim_strsave(buf);
 	if (p == NULL)
 	    break;
diff --git a/src/testdir/test73.in b/src/testdir/test73.in
index 5472247e7..666e4d2e5 100644
--- a/src/testdir/test73.in
+++ b/src/testdir/test73.in
@@ -158,6 +158,16 @@ SVoyager 2:w
 :" Find the file containing 'E.T.' in the Xfind/in/path directory
 :find file	
 :exec "w >>" . test_out
+:"
+:" Test that completion works when path=.,,
+:"
+:set path=.,,
+:" Open Jimmy Hoffa file
+:e in/file.txt
+:exec "w >>" . test_out
+:" Search for the file containing Holy Grail in same directory as in/path.txt
+:find stu	
+:exec "w >>" . test_out
 :q
 :exec "cd " . cwd
 :call DeleteDirectory("Xfind")
diff --git a/src/testdir/test73.ok b/src/testdir/test73.ok
index 366f95163..90efab756 100644
--- a/src/testdir/test73.ok
+++ b/src/testdir/test73.ok
@@ -17,3 +17,5 @@ Voyager 1
 Voyager 2
 Jimmy Hoffa
 E.T.
+Jimmy Hoffa
+Another Holy Grail
diff --git a/src/version.c b/src/version.c
index 3450db4a9..aaa8fa794 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    917,
 /**/
     916,
 /**/