diff --git a/.hgsigs b/.hgsigs
index 7d09d54c4b30fe5e7d9d0efb057a6d2e914b0d53..9efe1875b6ba759f0c87d671a279a71a96e73c3c 100644
--- a/.hgsigs
+++ b/.hgsigs
@@ -8,3 +8,4 @@ e9ed5d5cef4b3b27ac5d980b3e4aeadaabeeeae2 0 iQEcBAABAgAGBQJPwAS+AAoJEATWKx49+7T0n
 265061e0d3f4b3d8f9e4f0fc0b978cd51f84690d 0 iQEcBAABAgAGBQJQWIMhAAoJEATWKx49+7T0g/IH/3qqQemBP62Y+Wzo67DruphrJ5HSlIX4Uw/O4rOjrk8dWSMrsui5jFy4LXig+CR1dfY4RS0izTxsAiNhTACuavMfGHiYBKQW6UwIDlKECVBxbQyjB7v2C3FKPj9K9QReiYACSeB1RhQBnpbcvioif9H62VI5SKE6rjXyky6fDAxtbjhySb+nPDtV4HmV7ukcfDc3bxwcZkz9XXKoNmPWw8r34Z/RwxWbbWr8xUwW3+9LDB2Oz6PRyYP5S8EcNNYjk3ai2Llh0xuJGLQbpulhmjYDJmk20TkpLCFAfsYq1qW3yed9lL88CcFH4LDb9WA0LNs+7PfbmY/m8CX7JwUmHB8=
 64474c35967852bc452f71bc099ec3f8ded0369a 0 iQEcBAABAgAGBQJQWMvhAAoJEATWKx49+7T0NrYH/2PQuuFqzlku+NG8Iw0UN2yeDEML+2n1xG31ud7m3sNWw8lX+03gEd+LU8+LygHJJ0IAde/jBYRBbC8zj9UXDl3v5FIRwhcvGnllBCMMH7motfg+aLrCR/xs+0jV/AqpRin1VILHYFaB9UFP5PUgvJJiCUniQWoe+r41gra1hRA7OK3923YOOi9t4zJxoat7e0OMhc0IcdB7n3iQmyicbb8izKw/UvR2tR3T7fVcEl6u1LlbGaojtJA03V1L+a8QkmltiurD9VNmiHz++bGGJlA7LSmVYBq7BeC1lDnXUGO9ryZgln6aXRwUS0VaTI51F9gSMw+0UDJCwA5yBKqYyR8=
 4932026768454443d87d2e6445552b331589dbb1 0 iQEcBAABAgAGBQJRYIePAAoJEATWKx49+7T0p2oH/ROhjt/m+wZmT9+2NxEDwnaOoQ8m9TxkZiZ50mmi/k4L7OQe/xffxM2T3NTTgRkaLCK2+MEz0pSLJXL+n/AjTBtiynwSxYY+W0wtYKBIs0tcQHaSafN2u5LjtQZ2RHg+Fi1szhJQu/jy31w12KGTqdyVw05JuEPgyfM7fKpqKh8CQZJucEyn9Vf8boGPQMFJ7N6o4wpOeW8RuVcBAEToHMpkDI1OQmB22cEQJfZrdOMPaucUOG6Abfw0FDwwV4bHa1nmxiPZXF8DpW31SVDoZgyvi08TSWFHS9t8Pij+XyWIdXhbCzqdpkvLGEsvMJjhiro9agf2tSj9jP+D4xiFRe8=
+374ec93999588b1acc554f81f61c93bf9fad7037 0 iQEcBAABAgAGBQJRi6LgAAoJEATWKx49+7T0OPgH+gPOOYqdODGONhZTwxjKmvbVNzb428t/fS/pi2bSIeOXVzLone/P7NYstdM67eQsfxY4Kn8qN/eFkjdkozbc+3xx0VFvptFTd9NXGM57O84umgrvKXQDQM333TVMxMG5u6TPPkCmFcWmggcc1IdQxZ66dpgfETdh+IgJXdLQg4oc0IqHtqx19dVyYXRbtgY+GfA9ovFqOkzcWoXgSHRMmUf2gCGWPc3jSZPVHd3ObRvrwn3NcWULK4WCt5QPc6fU53eDrEvkSu6C5U0IV5G3jakrUK0PYtQ3jvxXGm8J3XQ+ea79Bp+mG/21Woz30Ey6AlFbuAHobGesGafjPLDLSNs=
diff --git a/INSTALL b/INSTALL
index a71e0d9f2624da5751036c7af679ca9fc3122355..d584340a4d824c99e3624b9ef3fcc596fd6bb9c4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -646,7 +646,7 @@ available when this package is compiled against the Dovecot headers only. The
 test suite executes a list of test cases and halts when one of them fails. If it
 executes all test cases successfully, the test suite finishes. You can execute
 the basic test suite using `make test`, which does not include the plugins. You
-can execute the full test suite using `make check`.
+can test the plugins using `make test-plugins`.
 
 A failing test case is always a bug and a report is greatly appreciated.
 
diff --git a/Makefile.am b/Makefile.am
index 792f3530fe3d8141cb7cf9c3522ceb1bde24b69b..50d3ba89d38a6373e6af19739f2abbda3420bf46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,4 +170,4 @@ $(extprograms_test_cases):
 test: $(test_cases)
 test-plugins: $(extprograms_test_cases)
 
-check: check-am test test-plugins all-am
+check: check-am test all-am
diff --git a/NEWS b/NEWS
index 2f2a106216d09b5fce096e33ec5443fbb6792b19..70c7929366058fc3790e43474cf8076376433a89 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v0.4.0 UNRELEASED Stephan Bosch <stephan@rename-it.nl>
+v0.4.0 09-05-2013 Stephan Bosch <stephan@rename-it.nl>
 
 	+ Added doveadm-sieve plugin that provides the possibility to synch Sieve
 	  scripts using doveadm sync along with the user's mailboxes.
@@ -18,6 +18,13 @@ v0.4.0 UNRELEASED Stephan Bosch <stephan@rename-it.nl>
 	  possible. Environment items "location", "phase" and "domain" now also
 	  return a usable value.
 
+v0.3.5 09-05-2013 Stephan Bosch <stephan@rename-it.nl>
+
+	- Sieve editheader extension: fixed interaction with the Sieve body extension.
+	  If used together, the deleteheader action could fail after a body test was
+	  performed.
+	- Test suite: fixed a time zone dependency in the Sieve date extension tests.
+
 v0.3.4 06-04-2013 Stephan Bosch <stephan@rename-it.nl>
 
 	* Changed error handling to be less of a nuisance for administrators. Strictly
diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index 84efa1d5b51c1e1c8a36cf8013e2e945564ce553..df0520be670b19f3c1fe2421ddffabf208993389 100644
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -70,7 +70,7 @@ AC_DEFUN([DC_DOVECOT],[
 	cd $dovecotdir
 	abs_dovecotdir=`pwd`
 	cd $old
-	DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
+	DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs --disable-shared"
 
 	eval `grep -i '^dovecot_[[a-z_]]*=' "$dovecotdir"/dovecot-config`
 	eval `grep '^LIBDOVECOT[[A-Z_]]*=' "$dovecotdir"/dovecot-config`