diff --git a/ChangeLog b/ChangeLog
index eceadff85..e75e39785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
    - markus@cvs.openbsd.org 2001/06/16 08:57:35
      [scp.c]
      no stdio or exit() in signal handlers.
+   - markus@cvs.openbsd.org 2001/06/16 08:58:34
+     [misc.c]
+     copy pw_expire and pw_change, too.
 
 20010615
  - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
@@ -5661,4 +5664,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1291 2001/06/21 03:08:58 mouring Exp $
+$Id: ChangeLog,v 1.1292 2001/06/21 03:11:27 mouring Exp $
diff --git a/misc.c b/misc.c
index aa9d775f4..283e17ec2 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $	*/
+/*	$OpenBSD: misc.c,v 1.11 2001/06/16 08:58:34 markus Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $");
+RCSID("$OpenBSD: misc.c,v 1.11 2001/06/16 08:58:34 markus Exp $");
 
 #include "misc.h"
 #include "log.h"
@@ -131,6 +131,8 @@ pwcopy(struct passwd *pw)
 	copy->pw_gecos = xstrdup(pw->pw_gecos);
 	copy->pw_uid = pw->pw_uid;
 	copy->pw_gid = pw->pw_gid;
+	copy->pw_expire = pw->pw_expire;
+	copy->pw_change = pw->pw_change;
 #ifdef HAVE_PW_CLASS_IN_PASSWD
 	copy->pw_class = xstrdup(pw->pw_class);
 #endif