diff --git a/ChangeLog b/ChangeLog
index e00df5bb6..898698f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-08-16  Johan Danielsson  <joda@pdc.kth.se>
+
+	* lib/krb5/krb5.h: turn strings into pointers, so we can assign to
+	them
+
+	* lib/krb5/constants.c: turn strings into pointers, so we can
+	assign to them
+
+	* lib/krb5/get_addrs.c (get_addrs_int): initialise res if
+	SCAN_INTERFACES is not set
+
+	* lib/krb5/context.c: fix various borked stuff in previous commits
+
 2002-08-16  Jacques Vidrine <n@nectar.com>
 
 	* lib/krb5/krbhst.c (kpasswd_get_next): if we fall back to using
@@ -6,6 +19,12 @@
 
 2002-08-15  Johan Danielsson  <joda@pdc.kth.se>
 
+	* lib/krb5/auth_context.c: check return value of
+	krb5_sockaddr2address
+
+	* lib/krb5/addr_families.c: check return value of
+	krb5_sockaddr2address
+
 	* lib/krb5/context.c: get the default keytab from KRB5_KTNAME
 
 2002-08-14  Johan Danielsson  <joda@pdc.kth.se>
diff --git a/lib/kadm5/ChangeLog b/lib/kadm5/ChangeLog
index f99e25d0c..6f811a7b3 100644
--- a/lib/kadm5/ChangeLog
+++ b/lib/kadm5/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-16  Johan Danielsson  <joda@pdc.kth.se>
+
+	* private.h: rename header file flag macro
+
+	* Makefile.am: generate kadm5-{protos,private}.h
+
 2002-08-15  Johan Danielsson  <joda@pdc.kth.se>
 
 	* ipropd_master.c: check return value of krb5_sockaddr2address