diff --git a/ChangeLog b/ChangeLog
index 5d5b04612ffbe9b30ac259fda5d1d99b7c231b1c..f75af7f1b18c98a5e391c0bf93917d1b8997caa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-07  Niels M�ller  <nisse@lysator.liu.se>
+
+	* tools/misc.h (werror): Removed incorrect noreturn attribute from
+	declaration.
+
+	* examples/io.c (read_file): Bug fix, in dependence of initial
+	size on max_size.
+
 2011-07-01  Niels M�ller  <nisse@lysator.liu.se>
 
 	* cbc.c	(CBC_BUFFER_LIMIT): Reduced to 512 bytes.