diff --git a/ChangeLog b/ChangeLog
index 8850e27cd..5fc605c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-01-05  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* lib/krb5/krb5_keyblock.3: document krb5_generate_subkey_extended
+
+	* lib/krb5/krb5_is_thread_safe.3: document function
+
+	* lib/krb5/Makefile.am (man_MANS) += krb5_is_thread_safe.3
+	
+	* lib/krb5/context.c (krb5_is_thread_safe): return TRUE is the
+	library was compiled with multithreading support. If not,
+	application must global lock the library, it it uses threads that
+	call kerberos functions at the same time.
+	
 2005-01-05  Luke Howard  <lukeh@padl.com>
 
 	* lib/krb5/auth_context.c: use krb5_generate_subkey_extended()