diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9ee89e9b2..559f99efe 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* path.cc (normalize_win32_path): Skip all slashes after recognizing
+	a ".." path component.  Add comment.
+
 2011-06-17  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.cc (fhandler_base::open): Drop local create_options variable.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 7b4f124e7..d3e5bb6db 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -1258,7 +1258,8 @@ normalize_win32_path (const char *src, char *dst, char *&tail)
 	      while (tail > dst + 1 && tail[-1] != '\\' && tail[-2] != ':')
 		tail--;
 	      src += 2;
-	      if (isdirsep (*src))
+	      /* Skip /'s to the next path component. */
+	      while (isdirsep (*src))
 		src++;
 	    }
 	}