diff --git a/dovecot-2.0.9-systd.patch b/dovecot-2.0.9-systd.patch
new file mode 100644
index 0000000..ca4bc96
--- /dev/null
+++ b/dovecot-2.0.9-systd.patch
@@ -0,0 +1,10 @@
+diff -up dovecot-2.0.9/dovecot.service.in.systd dovecot-2.0.9/dovecot.service.in
+--- dovecot-2.0.9/dovecot.service.in.systd	2011-02-17 11:57:04.921366472 +0100
++++ dovecot-2.0.9/dovecot.service.in	2011-02-17 11:57:04.922366479 +0100
+@@ -6,3 +6,6 @@ After=local-fs.target network.target
+ Type=simple
+ ExecStart=@sbindir@/dovecot -F
+ NonBlocking=yes
++
++[Install]
++WantedBy=multi-user.target
diff --git a/dovecot.spec b/dovecot.spec
index c4c239c..4d1a900 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 2.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -26,8 +26,7 @@ Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
-#for dovecot < 2.0.8
-Patch4: dovecot-2.0-bz654083.patch
+Patch4: dovecot-2.0.9-systd.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
@@ -105,6 +104,7 @@ 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 .systd
 
 %build
 #required for fdpass.c line 125,190: dereferencing type-punned pointer will break strict-aliasing rules
@@ -397,6 +397,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Thu Feb 17 2011 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.9-3
+- add missing section to dovecot's systemd service file
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild