diff --git a/NEWS b/NEWS
index 790de5b5ff27aa76e0675dea120eab35132f2e77..201239ed40db12d59461123214f43723624d4cd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+v0.4.11 xx-01-2016 Stephan Bosch <stephan@rename-it.nl>
+
+	- Sieve mime extension: Fixed the header :mime :anychild test to work properly
+	  outside a foreverypart loop.
+	- Several fixes in message body part handling:
+	  - Fixed assert failure occurring when text extraction is attempted on a
+	    empty or broken text part.
+	  - Fixed assert failure in handling of body parts that are converted to text.
+	  - Fixed header unfolding for (mime) headers parsed from any mime part.
+	  - Fixed trimming for (mime) headers parsed from any mime part.
+	  - Fixed erroneous changes to the message part tree structure performed when
+	    re-parsing the message.
+	- LDA Sieve plugin: Fixed logging of actions; sometimes the configured log
+	  format was not followed.
+	- LDA Sieve plugin: Fixed bug in error handling of script storage
+	  initialization.
+	- Sieve Extprograms plugin: Ignored ENOTCONN error in shutdown(fd, SHUT_WR)
+	  call.
+	- Fixed duplication of discard actions in the script result. Each discard was
+	  counted as a separate action, which means that action limit would be crossed
+	  too early.
+	- Made sure that quota errors never get logged as errors in syslog.
+	- Fixed handling of implicit keep for a partially executed transaction that
+	  yielded a temporary failure.
+	- Fixed handling of global errors. If master and user error handler were
+	  identical, in some cases the log message could be lost.
+	- Fixed AIX compile issue in message body parser.
+
 v0.4.10 13-12-2015 Stephan Bosch <stephan@rename-it.nl>
 
 	+ Implemented the Sieve mime and foreverypart extensions (RFC 5703). These
diff --git a/configure.ac b/configure.ac
index bb9a30b4178a2dc288acd9b8b2ac8d29172a9bcd..f7c5d77251a99c6edd6a4db3097bd9af60c6ad1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Pigeonhole], [0.4.10], [dovecot@dovecot.org], [dovecot-2.2-pigeonhole])
+AC_INIT([Pigeonhole], [0.4.11.rc1], [dovecot@dovecot.org], [dovecot-2.2-pigeonhole])
 AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.4.ABIv1($PACKAGE_VERSION)", [Pigeonhole ABI version])
 
 AC_CONFIG_AUX_DIR([.])