diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 3601619eb3..16cf676205 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,10 +1,11 @@
 # Template file for 'dovecot'
 pkgname=dovecot
-version=2.2.18
-revision=9
+version=2.2.19
+revision=1
+build_pie=yes
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
- --disable-static --with-pam --with-mysql --with-pgsql
+ --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
  --with-sqlite --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
@@ -13,11 +14,11 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1"
 homepage="http://dovecot.org"
 distfiles="${homepage}/releases/2.2/${pkgname}-${version}.tar.gz"
-checksum=b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb
+checksum=759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f
 
 makedepends="
  lz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel mit-krb5-devel
- libmysqlclient-devel postgresql-libs-devel sqlite-devel
+ libmysqlclient-devel postgresql-libs-devel sqlite-devel clucene-devel
  libldap-devel libcap-devel pam-devel libcurl-devel expat-devel"
 
 if [ "$CROSS_BUILD" ]; then
@@ -35,12 +36,6 @@ if [ "$CROSS_BUILD" ]; then
 		lib_cv_va_copy=yes
 		lib_cv___va_copy=yes
 		lib_cv_va_val_copy=yes"
-	# XXX clucene cannot be currently cross compiled
-	configure_args+=" --without-lucene"
-	subpackages="dovecot-devel dovecot-plugin-ldap dovecot-plugin-mysql dovecot-plugin-pgsql dovecot-plugin-sqlite"
-else
-	configure_args+=" --with-lucene"
-	makedepends+=" clucene-devel"
 fi
 
 # For SSL support.