diff --git a/.gitignore b/.gitignore
index f92e071..ebbeee1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.0-pigeonhole-0.2.2.tar.gz
 /dovecot-2.0.9.tar.gz
 /dovecot-2.0.11.tar.gz
+/dovecot-2.0.12.tar.gz
diff --git a/dovecot-2.0.11-settings.patch b/dovecot-2.0.11-settings.patch
deleted file mode 100644
index 36e5c21..0000000
--- a/dovecot-2.0.11-settings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
---- a/src/lib-settings/settings-parser.c	Fri Mar 04 20:53:46 2011 +0200
-+++ b/src/lib-settings/settings-parser.c	Sat Mar 26 01:10:59 2011 +0200
-@@ -693,8 +693,15 @@
- 		if (!settings_find_key_nth(ctx, parent_key, &parent_n,
- 					   &parent_def, &parent_link))
- 			return FALSE;
--		if (parent_def->type != SET_STRLIST)
--			return FALSE;
-+		if (parent_def == NULL) {
-+			/* we'll get here with e.g. "plugin/a/b=val".
-+			   not sure if we should ever do anything here.. */
-+			if (strcmp(parent_link->full_key, parent_key) != 0)
-+				return FALSE;
-+		} else {
-+			if (parent_def->type != SET_STRLIST)
-+				return FALSE;
-+		}
- 
- 		/* setting parent_key=0 adds it to links list */
- 		if (settings_parse_keyvalue(ctx, parent_key, "0") <= 0)
-
-
-
-
diff --git a/dovecot.spec b/dovecot.spec
index 0904cf7..04401a0 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.0.11
-Release: 5%{?dist}
+Version: 2.0.12
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -26,9 +26,6 @@ Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-#for < 2.0.12, rhbz#690401
-Patch4: dovecot-2.0.11-settings.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
 BuildRequires: libtool, autoconf, automake, pkgconfig
@@ -105,7 +102,6 @@ This package provides the development files for dovecot.
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
-%patch4 -p1 -b .settings
 
 %build
 #required for fdpass.c line 125,190: dereferencing type-punned pointer will break strict-aliasing rules
@@ -398,6 +394,12 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Wed Apr 13 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.12-1
+- dbox: Fixes to handling external attachments
+- dsync: More fixes to avoid hanging with remote syncs
+- dsync: Many other syncing/correctness fixes
+- doveconf: v2.0.10 and v2.0.11 didn't output plugin {} section right
+
 * Mon Mar 28 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.11-5
 - rebuild with new patch
 
diff --git a/sources b/sources
index a22a44b..652e33e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-088a850d6583a7ec0a8074ce929b3496  dovecot-2.0.11.tar.gz
+689e1a8863d4fb2fd252e1a6121dd181  dovecot-2.0.12.tar.gz
 23b9be534c62257a0d049b1370f11a99  dovecot-2.0-pigeonhole-0.2.2.tar.gz