diff --git a/ChangeLog b/ChangeLog
index 4a0b321d7c1d9f0e4b23d25d2344282c9131c370..eff784213570af2fc1e4afd0d324e810a451c12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
+2010-07-25  Niels M�ller  <nisse@lysator.liu.se>
+
+	* camellia-set-encrypt-key.c (camellia_set_encrypt_key): Inline
+	the expansion of camellia_setup128 and camellia_setup256, keeping
+	the unexpanded key in scalar variables.
+	(camellia_setup128): Deleted.
+	(camellia_setup256): Deleted.
+
 2010-07-24  Niels M�ller  <nisse@lysator.liu.se>
 
+	* camellia-set-encrypt-key.c (camellia_set_encrypt_key): Reduced
+	code size, no complete loop unroll. Use one loop for each phase of
+	the post-processing.
+
 	* testsuite/camellia-test.c: New tests for camellia_invert_key.
 	* testsuite/aes-test.c: New tests for aes_invert_key.