diff --git a/ChangeLog b/ChangeLog
index b70d9732e..5ed1b4257 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+<<<<<<< ChangeLog
+2004-10-31  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* lib/krb5/acache.c (make_cred_from_ccred): the address isn't a
+	sockaddr but rather a kerberos address, deal with that.  Based on
+	bug report from Jakob Schlyter <jakob@rfc.se>.
+
+2004-10-30  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* kdc/connect.c: Make sure argument passed to ctype isn't signed
+	char
+
 2004-10-14  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* lib/krb5/pkinit.c: match new error names
diff --git a/kadmin/ChangeLog b/kadmin/ChangeLog
index 74111a7ef..3e84d1c69 100644
--- a/kadmin/ChangeLog
+++ b/kadmin/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-31  Love Hörquist Åstrand  <lha@it.su.se>
+
+	* del_enctype.c (del_enctype): fix off-by-one error in del_enctype
+	From: <ragge@ludd.luth.se>
+	
 2004-08-13  Love Hörquist Åstrand  <lha@it.su.se>
 
 	* get.c: print keytypes on long format