diff --git a/.gitignore b/.gitignore
index c89ed63..ee94957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.1.2.tar.gz
 /pigeonhole-snap08a2d2718a65.tar.bz2
 /dovecot-2.1.3.tar.gz
+/dovecot-2.1.4.tar.gz
diff --git a/dovecot-2.1.4-postreleasefix.patch b/dovecot-2.1.4-postreleasefix.patch
new file mode 100644
index 0000000..c1f83e6
--- /dev/null
+++ b/dovecot-2.1.4-postreleasefix.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Timo Sirainen <tss@iki.fi>
+# Date 1334041779 -10800
+# Node ID 20e1aa322b1e3b7d47c7cb1b6ff68a8d07fe6c9d
+# Parent  0b59dbb1a288153d2eb26d47cd9f7a953335c66f
+lib-storage: mail_user_try_home_expand() now looks up home only when needed.
+Before a recent code cleanup the lookup was always done, but if the home
+didn't exist it still just happened to return success. The cleanup changed
+it to return failure, which broke the original behavior.
+
+diff -r 0b59dbb1a288 -r 20e1aa322b1e src/lib-storage/mail-user.c
+--- a/src/lib-storage/mail-user.c	Tue Apr 10 09:52:35 2012 +0300
++++ b/src/lib-storage/mail-user.c	Tue Apr 10 10:09:39 2012 +0300
+@@ -343,6 +343,11 @@
+ {
+ 	const char *home, *path = *pathp;
+ 
++	if (strncmp(path, "~/", 2) != 0) {
++		/* no need to expand home */
++		return 0;
++	}
++
+ 	if (mail_user_get_home(user, &home) <= 0)
+ 		return -1;
+ 
+
+
diff --git a/dovecot.spec b/dovecot.spec
index 8923c99..4a11cd4 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,7 +1,7 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.1.3
+Version: 2.1.4
 #global prever .rc6
 Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
@@ -27,6 +27,7 @@ Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 Patch4: dovecot-2.1-privatetmp.patch
+Patch5: dovecot-2.1.4-postreleasefix.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
@@ -111,6 +112,7 @@ This package provides the development files for dovecot.
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
 %patch4 -p1 -b .privatetmp
+%patch5 -p1 -b .postreleasefix
 sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
 
 %build
@@ -427,6 +429,18 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Tue Apr 10 2012 Michal Hlavinka <mhlavink@redhat.com> - 1:2.1.4-1
+- dovecot updated to 2.1.4
+- Proxying SSL connections crashed in v2.1.[23]
+- fts-solr: Indexing mail bodies was broken.
+- director: Several changes to significantly improve error handling
+- doveadm import didn't import messages' flags
+- mail_full_filesystem_access=yes was broken
+- Make sure IMAP clients can't create directories when accessing
+  nonexistent users' mailboxes via shared namespace.
+- Dovecot auth clients authenticating via TCP socket could have failed
+  with bogus "PID already in use" errors.
+
 * Mon Mar 19 2012 Michal Hlavinka <mhlavink@redhat.com> - 1:2.1.3-1
 - dovecot updated to 2.1.3
 - multi-dbox format in dovecot 2.1.2 was broken
diff --git a/sources b/sources
index 29fccc9..b8f7233 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-b5e7a5df774c271f0a12b1972fcfbb88  pigeonhole-snap08a2d2718a65.tar.bz2
-a0e25243862c61de6274cf7d682a76ec  dovecot-2.1.3.tar.gz
+9a360fc39462da71e2bfd1d6928f3902  dovecot-2.1.4.tar.gz
 a3e19701b775bfe1d8059c1dffd43f80  dovecot-2.1-pigeonhole-0.3.0.tar.gz