diff --git a/ChangeLog b/ChangeLog
index d38d667a3..19ba5cfa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Nov 16 00:32:48 1997  Johan Danielsson  <joda@emma.pdc.kth.se>
 
+	* kpasswd/kpasswdd.c: Get password expiration time from config
+ 	file.
+
 	* lib/asn1/{der_get,gen_decode}.c: Allow passing NULL size.
 
 Wed Nov 12 02:35:57 1997  Assar Westerlund  <assar@sics.se>
diff --git a/TODO b/TODO
index 14afd2672..9837aec2d 100644
--- a/TODO
+++ b/TODO
@@ -4,11 +4,7 @@ $Id$
 
 * admin
 
-add some kind of remote admin protocol
-
-* kpasswdd
-
-configuration control for password expiration
+integrate with kadmin
 
 * appl
 
@@ -18,11 +14,6 @@ more programs here
 
 Implement RFC1731 and 1734, pop over GSS-API
 
-** appl/rsh
-
-perhaps rsh and rshd should be able to handle the `traditional'
-  rsh-protocol as well.
-
 ** appl/telnet
 
 error messages when kerberos functions fail
@@ -92,8 +83,6 @@ fix to use rpc?
 
 ** lib/krb5
 
-fix addresses when there are no addresses
-
 replay cache not implemented
 
 the following encryption types have been implemented: DES-CBC-CRC,