diff --git a/ChangeLog b/ChangeLog
index df014ef4..404e3311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-02-04  Olaf Bergmann  <bergmann@tzi.org>
+
+	* resource.c (coap_print_link): This function now takes an offset
+	where printing starts. This is used for generating blocks on the
+	fly.
+
+	* net.c (wellknown_response): Added support for Block2 options
+	when generating a response for .well-known/core.
+
+	* block.h (coap_opt_block_num): Fixed handling of zero-length
+	options. COAP_OPT_BLOCK_LAST now returns NULL when the option
+	value's length is zero.
+
 2014-01-07  Olaf Bergmann  <bergmann@tzi.org>
 
 	* resource.c (coap_print_link): Output partial resource