diff --git a/ChangeLog b/ChangeLog
index 983a1c88..e8cab0d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-09-03  Olaf Bergmann  <bergmann@tzi.org>
+
+	* option.h (coap_option_setb): increased size of option type
+	argument
+
+	* tests/test_error_response.c (t_init_error_response_tests): new
+	tests for error response generation
+
+	* tests/test_pdu.c (t_encode_pdu5): fixed number for option Accept
+
+	* net.c (coap_new_error_response): fixed option size calculation
+
 2013-07-04  Olaf Bergmann  <bergmann@tzi.org>
 
 	* net.c (coap_new_context): register critical Accept option
diff --git a/configure.in b/configure.in
index 47631073..ef0e9f54 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,13 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright (C) 2010--2012 Olaf Bergmann <bergmann@tzi.org>
+# Copyright (C) 2010--2013 Olaf Bergmann <bergmann@tzi.org>
 #
 # This file is part of the CoAP library libcoap. Please see
 # README for terms of use. 
 
 AC_PREREQ([2.65])
-AC_INIT([libcoap], [4.0.2])
+AC_INIT([libcoap], [4.0.3])
 AC_CONFIG_SRCDIR([coap.h])
 
 # First check for Contiki build to quit configure before any other test