diff --git a/ChangeLog b/ChangeLog
index a19c751b8..94c2d33f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-20  Johan Danielsson  <joda@pdc.kth.se>
 
+	* lib/krb5/log.c: rename syslog_data to avoid name conflicts (from
+	Mattias Amnefelt)
+
 	* kuser/klist.c (display_tokens): increase token buffer size, and
 	add more checks of the kernel data (from Love)
 
diff --git a/lib/roken/ChangeLog b/lib/roken/ChangeLog
index 7db2bbb43..a638220e0 100644
--- a/lib/roken/ChangeLog
+++ b/lib/roken/ChangeLog
@@ -1,3 +1,18 @@
+2002-08-20  Johan Danielsson  <joda@pdc.kth.se>
+
+	* strlcat.c: add some consistency checks
+
+	* strlcpy.c: make the logic simpler, and handle dst_sz == 0
+
+2002-08-19  Johan Danielsson  <joda@pdc.kth.se>
+
+	* resolve.h: prefix these functions to avoid conflicts with other
+	packages
+
+2002-08-14  Johan Danielsson  <joda@pdc.kth.se>
+
+	* strsep_copy.c: don't write to buf if len == 0
+
 2002-05-31  Assar Westerlund  <assar@pdc.kth.se>
 
 	* Makefile.am: *_LDADD: add LDADD, so that libroken is used