diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e700f2e..466e77e 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9185,7 +9185,7 @@
 	}
 #endif
 	dir_differs = new_dir == NULL || prev_dir == NULL
-					     || STRCMP(prev_dir, new_dir) != 0;
+			|| pathcmp((char *)prev_dir, (char *)new_dir, -1) != 0;
 	if (new_dir == NULL || (dir_differs && vim_chdir(new_dir)))
 	    EMSG(_(e_failed));
 	else
diff --git a/src/misc2.c b/src/misc2.c
index 4e3b845..060a333 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3402,7 +3402,7 @@
     vim_strncpy(new_dir, fname, MAXPATHL - 1);
     *gettail_sep(new_dir) = NUL;
 
-    if (STRCMP(old_dir, new_dir) == 0)
+    if (pathcmp((char *)old_dir, (char *)new_dir, -1) == 0)
 	// nothing to do
 	res = OK;
     else
diff --git a/src/version.c b/src/version.c
index c73a3ed..10361cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    604,
+/**/
     603,
 /**/
     602,