diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index d4af3410e30..7e3ad800df7 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot'
 pkgname=dovecot
-version=2.1.10
+version=2.1.12
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -8,16 +8,12 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
 --with-sqlite --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl
 --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-libcap
 --with-solr --with-docs --with-systemdsystemunitdir=/usr/lib/systemd/system"
-depends="openssl>=0"
-makedepends="openssl-devel mit-krb5-devel libmysqlclient-devel>=5.5.27
-postgresql-libs-devel sqlite-devel libldap-devel libcap-devel pam-devel
-libcurl-devel expat-devel"
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://dovecot.org"
 distfiles="$homepage/releases/2.1/$pkgname-$version.tar.gz"
-checksum=8acc99c2a7e8b598aef2fef443c5fb6779099e57573f86a1eaa2b8479d0becb9
+checksum=d76ae15146452d053c423d883b2cbc24f62a55cf2f1f547577f42bc7d8d20840
 long_desc="
  Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like
  systems, written with security primarily in mind. Dovecot is an excellent
@@ -25,7 +21,7 @@ long_desc="
  up, requires no special administration and it uses very little memory."
 
 subpackages="${pkgname}-plugin-ldap ${pkgname}-plugin-mysql"
-subpackages="${subpackages} ${pkgname}-plugin-pgsql ${pkgname}-plugin-sqlite"
+ ${pkgname}-plugin-pgsql ${pkgname}-plugin-sqlite"
 
 systemd_services="dovecot.service true"
 system_accounts="dovecot dovenull"
@@ -57,6 +53,13 @@ conf_files="
 /etc/dovecot/dovecot.conf
 /etc/ssl/dovecot-openssl.cnf"
 
+# For SSL support.
+depends="openssl>=0"
+
+makedepends="openssl-devel mit-krb5-devel libmysqlclient-devel>=5.5.27
+ postgresql-libs-devel sqlite-devel libldap-devel libcap-devel pam-devel
+ libcurl-devel expat-devel"
+
 post_install() {
 	local econfdir=usr/share/doc/dovecot/example-config
 	local econfdird=${econfdir}/conf.d