diff -Nru dovecot-2.2.22/debian/changelog dovecot-2.2.22/debian/changelog
--- dovecot-2.2.22/debian/changelog	2016-04-05 14:19:25.000000000 +0200
+++ dovecot-2.2.22/debian/changelog	2016-09-21 11:08:22.000000000 +0200
@@ -1,3 +1,17 @@
+dovecot (1:2.2.22-1ubuntu2.1) xenial; urgency=medium
+
+  * Disable dovecot-lucene plugin as it had various issues, universe
+    dependencies and is deprecated in favor of solr (LP: #1524526).
+    - make dovecot-lucene an empty package.
+    - disable building lucene, now --without-lucene.
+    - remove libclucene-dev build dependency.
+    - drop debian/dovecot-lucene.links, debian/dovecot-lucene.dirs and
+      drop debian/dovecot-lucene.lintian-overrides.
+    - add dovecot-lucene.README.Debian and dovecot-lucene.NEWS to explain
+      to users why it is empty.
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 21 Sep 2016 10:26:44 +0200
+
 dovecot (1:2.2.22-1ubuntu2) xenial; urgency=medium
 
   * Rebuild against libmysqlclient20.
diff -Nru dovecot-2.2.22/debian/control dovecot-2.2.22/debian/control
--- dovecot-2.2.22/debian/control	2016-03-21 20:30:29.000000000 +0100
+++ dovecot-2.2.22/debian/control	2016-09-21 10:44:50.000000000 +0200
@@ -24,7 +24,6 @@
                libwrap0-dev,
                dh-systemd,
                lsb-release,
-               libclucene-dev (>= 2.3),
                liblzma-dev,
                liblz4-dev,
                libexttextcat-dev,
@@ -39,7 +38,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), openssl, adduser, ucf (>= 2.0020), ssl-cert, lsb-base
 Recommends: ntpdate
-Suggests: ntp, dovecot-gssapi, dovecot-sieve, dovecot-pgsql, dovecot-mysql, dovecot-sqlite, dovecot-ldap, dovecot-imapd, dovecot-pop3d, dovecot-lmtpd, dovecot-managesieved, dovecot-solr, dovecot-lucene, ufw
+Suggests: ntp, dovecot-gssapi, dovecot-sieve, dovecot-pgsql, dovecot-mysql, dovecot-sqlite, dovecot-ldap, dovecot-imapd, dovecot-pop3d, dovecot-lmtpd, dovecot-managesieved, dovecot-solr, ufw
 Provides: dovecot-common, dovecot-abi-${dovecot:ABI-Version}
 Replaces: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4)
 Breaks: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4)
diff -Nru dovecot-2.2.22/debian/dovecot-lucene.dirs dovecot-2.2.22/debian/dovecot-lucene.dirs
--- dovecot-2.2.22/debian/dovecot-lucene.dirs	2016-03-19 00:29:36.000000000 +0100
+++ dovecot-2.2.22/debian/dovecot-lucene.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/dovecot/modules
diff -Nru dovecot-2.2.22/debian/dovecot-lucene.links dovecot-2.2.22/debian/dovecot-lucene.links
--- dovecot-2.2.22/debian/dovecot-lucene.links	2016-03-19 00:29:36.000000000 +0100
+++ dovecot-2.2.22/debian/dovecot-lucene.links	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/share/bug/dovecot-core /usr/share/bug/dovecot-lucene
diff -Nru dovecot-2.2.22/debian/dovecot-lucene.lintian-overrides dovecot-2.2.22/debian/dovecot-lucene.lintian-overrides
--- dovecot-2.2.22/debian/dovecot-lucene.lintian-overrides	2016-03-19 00:29:36.000000000 +0100
+++ dovecot-2.2.22/debian/dovecot-lucene.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-dovecot-lucene: hardening-no-fortify-functions usr/lib/dovecot/modules/lib21_fts_lucene_plugin.so
-
diff -Nru dovecot-2.2.22/debian/dovecot-lucene.NEWS dovecot-2.2.22/debian/dovecot-lucene.NEWS
--- dovecot-2.2.22/debian/dovecot-lucene.NEWS	1970-01-01 01:00:00.000000000 +0100
+++ dovecot-2.2.22/debian/dovecot-lucene.NEWS	2016-09-21 10:43:10.000000000 +0200
@@ -0,0 +1,12 @@
+dovecot (1:2.2.22-1ubuntu2.1) xenial; urgency=medium
+
+  This release makes dovecot-lucene an empty package. It was broken by
+  mis-including Snowball code. Eventually it ended up causing segfaults when
+  used. Since there never was a usable version existing and the lucene is
+  deprecated upstream in favor of solr the decision was made against a very
+  complex and error-prone fix and instead to disable the lucene plugin.
+
+  For extra background info you can read more on:
+    https://bugs.launchpad.net/ubuntu/+source/dovecot/+bug/1524526
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 21 Sep 2016 10:35:26 +0200
diff -Nru dovecot-2.2.22/debian/dovecot-lucene.README.Debian dovecot-2.2.22/debian/dovecot-lucene.README.Debian
--- dovecot-2.2.22/debian/dovecot-lucene.README.Debian	1970-01-01 01:00:00.000000000 +0100
+++ dovecot-2.2.22/debian/dovecot-lucene.README.Debian	2016-09-21 11:06:59.000000000 +0200
@@ -0,0 +1,2 @@
+Please note that this is an empty package since 2.2.22-1ubuntu2.1.
+See NEWS for more.
diff -Nru dovecot-2.2.22/debian/rules dovecot-2.2.22/debian/rules
--- dovecot-2.2.22/debian/rules	2016-03-21 20:29:50.000000000 +0100
+++ dovecot-2.2.22/debian/rules	2016-09-21 10:45:09.000000000 +0200
@@ -57,8 +57,6 @@
 
 solr_files = usr/lib/dovecot/modules/lib??_fts_solr_*
 
-lucene_files = usr/lib/dovecot/modules/lib??_fts_lucene_*
-
 dev_files = usr/include/* \
 	    usr/lib/dovecot/dovecot-config
 
@@ -77,7 +75,7 @@
 	            --with-solr \
 	            --with-ioloop=best \
 	            --with-libwrap \
-	            --with-lucene \
+	            --without-lucene \
 		    --with-lz4 \
 	            --prefix=/usr \
 	            --sysconfdir=/etc \