diff --git a/ChangeLog b/ChangeLog
index 4348b2826..65f71f50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-26  Assar Westerlund  <assar@kth.se>
+
+	* lib/krb5/principal.c (krb5_425_conv_principal_ext): lookup AAAA
+	rrs before A ones when using the resolver to verify a mapping,
+	also use getaddrinfo when resolver is not available
+
+	* lib/hdb/keytab.c (find_db): const-correctness in parameters to
+	krb5_config_get_next
+
+	* lib/asn1/gen.c: include <string.h> in the generated files (for
+	memset)
+
 2002-08-22  Assar Westerlund  <assar@kth.se>
 
 	* lib/krb5/test_get_addrs.c, lib/krb5/krbhst-test.c: make it use
diff --git a/cf/ChangeLog b/cf/ChangeLog
index b4772434c..15be0bbef 100644
--- a/cf/ChangeLog
+++ b/cf/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-26  Assar Westerlund  <assar@kth.se>
+
+	* roken-frag.m4: test for the vis, strvis functions requiring
+	prototypes
+
 2002-08-20  Johan Danielsson  <joda@pdc.kth.se>
 
 	* roken-frag.m4: HAVE_TYPE instead of CHECK_TYPE ssize_t
diff --git a/lib/kadm5/ChangeLog b/lib/kadm5/ChangeLog
index 6f811a7b3..9c7f81ca7 100644
--- a/lib/kadm5/ChangeLog
+++ b/lib/kadm5/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-26  Assar Westerlund  <assar@kth.se>
+
+	* ipropd_slave.c (receive_everything): type-correctness calling
+	_krb5_get_int
+
+	* context_s.c (find_db_spec): const-correctness in parameters to
+	krb5_config_get_next
+
 2002-08-16  Johan Danielsson  <joda@pdc.kth.se>
 
 	* private.h: rename header file flag macro
diff --git a/lib/roken/ChangeLog b/lib/roken/ChangeLog
index 14b71fbb8..ee723ffd9 100644
--- a/lib/roken/ChangeLog
+++ b/lib/roken/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-26  Assar Westerlund  <assar@kth.se>
+
+	* roken.h.in: add prototypes for str, unvis functions
+	* resolve.h: add fallback definition for T_AAAA
+
 2002-08-22  Johan Danielsson  <joda@pdc.kth.se>
 
 	* roken.h.in: we may need a prototype for strndup