diff --git a/ChangeLog b/ChangeLog
index 5837f044a..ac7f669c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-22  Assar Westerlund  <assar@sics.se>
+
+	* lib/krb5/changepw.c: use a datagram socket and remove the
+	sequence numbers
+
 2000-07-22  Johan Danielsson  <joda@pdc.kth.se>
 
 	* kuser/klist.c: make -a and -n aliases for -v
@@ -9,6 +14,17 @@
 
 	* lib/krb5/read_message.c (krb5_read_message): return error if EOF
 
+2000-07-20  Assar Westerlund  <assar@sics.se>
+
+	* kpasswd/kpasswd.c: print usage consistently
+	* kdc/hprop.h (HPROP_KEYTAB): use HDB for the keytab
+	* kdc/hpropd.c: add --keytab
+	* kdc/hpropd.c: don't care what principal we recvauth as
+
+	* lib/krb5/get_cred.c: be more careful of not returning creds at
+	all when an error is returned
+	* lib/krb5/fcache.c (fcc_gen_new): do mkstemp correctly
+
 2000-07-19  Johan Danielsson  <joda@pdc.kth.se>
 
 	* fix-export: use autoreconf
diff --git a/kadmin/ChangeLog b/kadmin/ChangeLog
index 5edd3c13c..4a3266302 100644
--- a/kadmin/ChangeLog
+++ b/kadmin/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-22  Assar Westerlund  <assar@sics.se>
+
+	* version4.c: map both princ_expire_time and pw_expiration to v4
+	principal expiration
+
 2000-07-22  Johan Danielsson  <joda@pdc.kth.se>
 
 	* version4.c (handle_v4): check for termination
@@ -9,6 +14,18 @@
 
 	* server.c: use krb5_read_priv_message; (v5_loop): check for EOF
 
+2000-07-20  Assar Westerlund  <assar@sics.se>
+
+	* init.c (init): also create `kadmin/hprop'
+	* kadmind.c: ports is a string argument
+	* kadm_conn.c (start_server): fix printf format
+
+	* kadmin_locl.h: add <sys/select.h>
+	* kadm_conn.c: remove sys/select.h.  make signal handlers
+	type-correct and static
+
+	* kadmin_locl.h: add limits.h and sys/select.h
+
 2000-07-11  Johan Danielsson  <joda@pdc.kth.se>
 
 	* version4.c: change log strings to match the v5 counterparts