diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b677111f4..92ddce3d7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* path.cc (path_conv::check): Don't strip trailing dots and spaces
+	at the start of the path.
+
 2005-06-24  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.cc (rootdir): Don't set errno.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 1e315e492..ca955cb3a 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -928,7 +928,7 @@ out:
 	    else if (!tail)
 	      tail = p;
 
-	  if (!tail)
+	  if (!tail || tail == path)
 	    /* nothing */;
 	  else if (tail[-1] != '\\')
 	    {