diff --git a/ChangeLog b/ChangeLog
index 095c560d0..de41b8468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -168,6 +168,7 @@
    - deraadt@cvs.openbsd.org 2001/03/04 18:21:28
      [sshd.8]
      list SSH2 ciphers
+ - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy()
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4360,4 +4361,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.903 2001/03/05 07:48:45 mouring Exp $
+$Id: ChangeLog,v 1.904 2001/03/05 07:57:09 mouring Exp $
diff --git a/misc.c b/misc.c
index 24f7df597..495b0290d 100644
--- a/misc.c
+++ b/misc.c
@@ -108,7 +108,9 @@ pwcopy(struct passwd *pw)
 	copy->pw_gecos = xstrdup(pw->pw_gecos);
 	copy->pw_uid = pw->pw_uid;
 	copy->pw_gid = pw->pw_gid;
+#ifdef HAVE_PW_CLASS_IN_PASSWD
 	copy->pw_class = xstrdup(pw->pw_class);
+#endif
 	copy->pw_dir = xstrdup(pw->pw_dir);
 	copy->pw_shell = xstrdup(pw->pw_shell);
 	return copy;