diff --git a/ChangeLog b/ChangeLog
index 0efe52f40..71b1a53fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,9 @@
    - markus@cvs.openbsd.org 2001/02/28 12:55:07
      [channels.c]
      unify debug messages
+   - deraadt@cvs.openbsd.org 2001/02/28 17:52:54
+     [misc.c]
+     for completeness, copy pw_gecos too
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4271,4 +4274,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.874 2001/03/05 06:20:14 mouring Exp $
+$Id: ChangeLog,v 1.875 2001/03/05 06:22:01 mouring Exp $
diff --git a/misc.c b/misc.c
index fdfd13ca6..24f7df597 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.3 2001/02/28 05:34:28 deraadt Exp $	*/
+/*	$OpenBSD: misc.c,v 1.4 2001/02/28 17:52:54 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.3 2001/02/28 05:34:28 deraadt Exp $");
+RCSID("$OpenBSD: misc.c,v 1.4 2001/02/28 17:52:54 deraadt Exp $");
 
 #include "misc.h"
 #include "log.h"
@@ -101,9 +101,11 @@ struct passwd *
 pwcopy(struct passwd *pw)
 {
 	struct passwd *copy = xmalloc(sizeof(*copy));
+
 	memset(copy, 0, sizeof(*copy));
 	copy->pw_name = xstrdup(pw->pw_name);
 	copy->pw_passwd = xstrdup(pw->pw_passwd);
+	copy->pw_gecos = xstrdup(pw->pw_gecos);
 	copy->pw_uid = pw->pw_uid;
 	copy->pw_gid = pw->pw_gid;
 	copy->pw_class = xstrdup(pw->pw_class);