diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 992f32d4539..f3c8755b3a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* w32-fns.el (convert-standard-filename): Start replacing slashes
+	from the beginning of the file name, not from where the last
+	invalid character was.  From "Andrew Maguire (SWW)"
+	<Andrew.Maguire@Smallworld.co.uk>
+
 2001-05-07  MORIOKA Tomohiko  <tomo@m17n.org>
 
 	The following changes are to provide infrastructure for handling
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 8e0e85dc5f1..018390d4b4a 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -266,11 +266,12 @@ with a definition that really does change some file names."
       (setq start (match-end 0)))
     ;; convert directory separators to Windows format
     ;; (but only if the shell in use requires it)
-    (if (w32-shell-dos-semantics)
-	(while (string-match "/" name start)
-	  (aset name (match-beginning 0) ?\\)
-	  (setq start (match-end 0))))
-      name))
+    (when (w32-shell-dos-semantics)
+      (setq start 0)
+      (while (string-match "/" name start)
+	(aset name (match-beginning 0) ?\\)
+	(setq start (match-end 0))))
+    name))
 
 ;;; Fix interface to (X-specific) mouse.el
 (defun x-set-selection (type data)