diff --git a/ChangeLog b/ChangeLog
index cc853970e..1e4cea5ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2000-07-05  Johan Danielsson  <joda@pdc.kth.se>
+
+	* kdc/hprop.c: only get master key if we're actually going to use
+	it; enable reading of MIT krb5 dump files
+	
+	* kdc/mit_dump.c: read MIT krb5 dump files
+	
+	* lib/hdb/mkey.c (read_master_mit): fix this
+	
+	* kdc/kstash.c: make this work with the new mkey code
+	
+	* lib/hdb/Makefile.am: add mkey.c, and bump version number
+	
+	* lib/hdb/hdb.h: rewrite master key handling
+	
+	* lib/hdb/mkey.c: rewrite master key handling
+	
+	* lib/krb5/crypto.c: add some more pseudo crypto types
+	
+	* lib/krb5/krb5.h: change some funny etypes to use negative
+	numbers, and add some more
+
 2000-07-02  Assar Westerlund  <assar@sics.se>
 
 	* lib/krb5/keytab_keyfile.c (akf_add_entry): remove unused
diff --git a/NEWS b/NEWS
index ff92125d8..a938a6752 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changes in release 0.3a:
 
+ * modularise the handling of the master key, and allow for other
+   encryption types. This makes it easier to import a database from
+   some other source without having to re-encrypt all keys.
+
+ * allow for better control over which encryption types are created
+
  * make kinit fallback to v4 if given a v4 KDC
 
  * make klist work better with v4 and v5