diff --git a/kadmin/ChangeLog b/kadmin/ChangeLog
index 953eaa1cd..f9e547066 100644
--- a/kadmin/ChangeLog
+++ b/kadmin/ChangeLog
@@ -1,5 +1,19 @@
 1999-05-04  Assar Westerlund  <assar@sics.se>
 
+	* kadmin_locl.h (set_entry): add prototype
+
+	* kadmin.c (usage): update usage string
+
+	* init.c (init): new arguments realm-max-ticket-life and
+ 	realm-max-renewable-life
+
+	* util.c (edit_time, edit_attributes): don't do anything if it's
+ 	already set
+	(set_entry): new function
+
+	* ank.c (add_new_key): new options for setting max-ticket-life,
+ 	max-renewable-life, and attributes
+
 	* server.c (v5_loop): remove unused variable
 
 	* kadmin_locl.h: add prototypes
diff --git a/lib/kadm5/ChangeLog b/lib/kadm5/ChangeLog
index b760a0044..593a3ce1f 100644
--- a/lib/kadm5/ChangeLog
+++ b/lib/kadm5/ChangeLog
@@ -1,3 +1,18 @@
+1999-05-04  Assar Westerlund  <assar@sics.se>
+
+	* private.h (_kadm5_setup_entry): change prototype
+
+	* modify_s.c: call new _kadm5_setup_entry
+
+	* ent_setup.c (_kadm5_setup_entry): change so that it takes three
+ 	masks, one for what bits to set and one for each of principal and
+ 	def containing the bits that are set there.
+
+	* create_s.c: call new _kadm5_setup_entry
+
+	* create_s.c (get_default): check return value
+	(create_principal): send wider mask to _kadm5_setup_entry
+
 1999-05-04  Johan Danielsson  <joda@pdc.kth.se>
 
 	* send_recv.c (_kadm5_client_recv): handle arbitrarily sized