diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d5b91c33a..57f7092cc 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-13  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
+
+	* path.cc (special_name): Add checks for some specials followed by
+	a "." and a FIXME comment.
+
 2003-08-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwin.din: Accomodate change from cygwin_lstat to lstat.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 512720e8e..7241994a2 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -1418,10 +1418,15 @@ special_name (const char *s, int inc = 1)
   if (strpbrk (s, special_chars))
     return !strncasematch (s, "%2f", 3);
 
+  // FIXME: add com0 and {com,lpt}N.*
   if (strcasematch (s, "nul")
+      || strncasematch (s, "nul.", 4)
       || strcasematch (s, "aux")
+      || strncasematch (s, "aux.", 4)
       || strcasematch (s, "prn")
+      || strncasematch (s, "prn.", 4)
       || strcasematch (s, "con")
+      || strncasematch (s, "con.", 4)
       || strcasematch (s, "conin$")
       || strcasematch (s, "conout$"))
     return -1;