diff --git a/src/misc1.c b/src/misc1.c
index fd178c9..0859dc7 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -9317,7 +9317,8 @@
 	    continue;  /* it's different when it's shorter */
 
 	rival = other_paths[j] + other_path_len - candidate_len;
-	if (fnamecmp(maybe_unique, rival) == 0)
+	if (fnamecmp(maybe_unique, rival) == 0
+		&& (rival == other_paths[j] || vim_ispathsep(*(rival - 1))))
 	    return FALSE;  /* match */
     }
 
diff --git a/src/version.c b/src/version.c
index 79522a4..76d3d9e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1,
+/**/
     0
 };