diff --git a/ChangeLog b/ChangeLog
index 1c6c84a19..40edf32fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-02-18  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* lib/krb5/init_creds.c: use the new merged flags field.
+	(krb5_get_init_creds_opt_set_win2k): new function, turn on all w2k
+	compat flags.
+
+	* lib/krb5/init_creds_pw.c: use the new merged flags field.
+
+	* lib/krb5/krb5_locl.h: merge all flags into one entity
+	
+2007-02-11  Dave Love  <fx@gnu.org>
+	
+	* lib/krb5/krb5_aname_to_localname.3: Small fixes
+	
+	* lib/krb5/krb5_digest.3: Small fixes
+	
+	* kuser/kimpersonate.1: Small fixes
+
 2007-02-17  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* lib/krb5/init_creds_pw.c (find_pa_data): if there is no list,