diff --git a/ChangeLog b/ChangeLog
index 2a25a970c..fc62beb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-25  Johan Danielsson  <joda@pdc.kth.se>
+
+	* kdc/hprop.c (ka_convert): allow using null salt, and treat 0
+	pw_expire as never (from Derrick Brashear)
+
 2000-06-24  Johan Danielsson  <joda@pdc.kth.se>
 
 	* kdc/connect.c (add_standard_ports): only listen to port 750 if