diff --git a/ChangeLog b/ChangeLog
index fad786106..1499f588f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
  - (djm) Force standard PAM conversation function in a few more places.
    Patch from Redhat 2.5.1p1-2 RPM, probably Nalin Dahyabhai 
    <nalin@redhat.com>
+ - (djm) Cygwin needs pw->pw_gecos copied too. Patch from Corinna Vinschen 
+   <vinschen@redhat.com>
 
 20010228
  - (djm) Detect endianness in configure and use it in rijndael.c. Fixes
@@ -4172,4 +4174,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.843 2001/02/28 22:18:57 djm Exp $
+$Id: ChangeLog,v 1.844 2001/02/28 22:48:13 djm Exp $
diff --git a/auth.c b/auth.c
index a0a3fb6de..61984a076 100644
--- a/auth.c
+++ b/auth.c
@@ -181,6 +181,9 @@ pwcopy(struct passwd *pw)
 	copy->pw_gid = pw->pw_gid;
 #ifdef HAVE_PW_CLASS_IN_PASSWD
 	copy->pw_class = xstrdup(pw->pw_class);
+#endif
+#ifdef HAVE_CYGWIN
+	copy->pw_gecos = xstrdup(pw->pw_gecos);
 #endif
 	copy->pw_dir = xstrdup(pw->pw_dir);
 	copy->pw_shell = xstrdup(pw->pw_shell);