diff --git a/NEWS b/NEWS
index 9c0842d7c215854260cd3bdcc9734b52d26f6064..7634983f7e1fb4ff263771cb9bf3b31305520d21 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+v0.3.6 26-09-2013 Stephan Bosch <stephan@rename-it.nl>
+
+	- Fixed a binary code read problem in the `set' command of the Sieve variables
+	  extension. Using the set command with a modifier and an empty string value
+	  would cause code corruption problems while running the script.
+	- Various fixes for compiler and static analyzer warnings, as reported
+	  by CLang.
+	- ManageSieve: Fixed '[' ']' stupidity for response codes (only happened
+	  before login).
+	- Fixed setting name in example-config/conf.d/20-managesieve.conf.
+	- Fixed messed up hex output for sieve-dump tool.
+
 v0.3.5 09-05-2013 Stephan Bosch <stephan@rename-it.nl>
 
 	- Sieve editheader extension: fixed interaction with the Sieve body extension.
diff --git a/configure.in b/configure.in
index 834aa4166ded652f0aa0e568ab2677f8d53cb419..0dd1ec240aed841b602c4ab8779cbc48cbf90ef9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([Pigeonhole], [0.3.5], [dovecot@dovecot.org], [dovecot-2.1-pigeonhole])
+AC_INIT([Pigeonhole], [0.3.6], [dovecot@dovecot.org], [dovecot-2.1-pigeonhole])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_MACRO_DIR([m4])