diff --git a/ChangeLog b/ChangeLog
index d9ba1a4bf..11cab052e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-29  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* lib/krb5/pkinit.c (pk_verify_host): set better error string,
+	only check kdc name/address when we got a hostname/address passed
+	in the the function.
+
+	* kdc/pkinit.c (_kdc_pk_check_client): reorganize and make log
+	when a SAN matches.
+	
 2006-04-28  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* doc/setup.texi: More options and some text about windows
diff --git a/tests/ChangeLog b/tests/ChangeLog
index cce10a35c..43116a7c4 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 2006-04-29  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* kdc/pki-mapping: change pki-mapping
+	
 	* kdc/Makefile.am: clean the server.keytab
 
 	* kdc/check-kdc.in: Add test for pk-init