diff --git a/ChangeLog b/ChangeLog
index 869d0e535..8d2faa771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-15  Assar Westerlund  <assar@sics.se>
+
+	* lib/krb5/principal.c (krb5_524_conv_principal): comment-ize, and
+	simplify string copying
+
 2000-05-12  Assar Westerlund  <assar@sics.se>
 
 	* lib/krb5/fcache.c (scrub_file): new function
diff --git a/lib/kadm5/ChangeLog b/lib/kadm5/ChangeLog
index eba731df0..a33328af7 100644
--- a/lib/kadm5/ChangeLog
+++ b/lib/kadm5/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-12  Assar Westerlund  <assar@sics.se>
+
+	* get_s.c (kadm5_s_get_principal): set life, rlife to INT_MAX as a
+	fallback.  handle not having any creator.
+	* destroy_s.c (kadm5_s_destroy): free all allocated memory
+	* context_s.c (set_field): free variable if it's already set
+	(find_db_spec): malloc space for all strings
+
 2000-04-05  Assar Westerlund  <assar@sics.se>
 
 	* Makefile.am (LDADD): add LIB_openldap