diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 43bcdf006..f5e8e1551 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-01  Christopher Faylor  <cgf@redhat.com>
+
+	* syscalls.cc (link): Properly deal with a link to a symlink.
+
 2002-08-01  Christopher Faylor  <cgf@redhat.com>
 
 	* cygthread.cc: Remove cruft.
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 4b2fc3d07..84d080cf9 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -617,6 +617,7 @@ _link (const char *a, const char *b)
   sigframe thisframe (mainthread);
   path_conv real_b (b, PC_SYM_NOFOLLOW | PC_FULL);
   path_conv real_a (a, PC_SYM_NOFOLLOW | PC_FULL);
+  extern BOOL allow_winsymlinks;
 
   if (real_a.error)
     {
@@ -647,6 +648,8 @@ _link (const char *a, const char *b)
   /* Try to make hard link first on Windows NT */
   if (wincap.has_hard_links ())
     {
+      if (allow_winsymlinks && real_b.issymlink ())
+	strcat (real_a, ".lnk");
       if (CreateHardLinkA (real_b, real_a, NULL))
 	{
 	  res = 0;