diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a730fbc2c..055f6fcf7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-12  Christopher Faylor  <cgf@redhat.com>
+
+	* fhandler_disk_file.cc (path_conv::ndisk_links): Fix problem where
+	search characters overwrote the path instead of being tacked on the
+	end.
+
 2003-09-12  Christopher Faylor  <cgf@redhat.com>
 
 	* dcrt0.cc (_dll_crt0): Accommodate breaking apart of early_stuff_init.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 7aba0b40c..e8c66bba8 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -53,9 +53,9 @@ path_conv::ndisk_links (DWORD nNumberOfLinks)
     }
 
   if (len == 0 || isdirsep (fn[len - 1]))
-    strcpy (fn, s + 1);
+    strcpy (fn + len, s + 1);
   else
-    strcat (fn, s);
+    strcpy (fn + len, s);
 
   WIN32_FIND_DATA buf;
   HANDLE h = FindFirstFile (fn, &buf);