diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index d4f5814280fb..6520e5a0f445 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.6
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 
@@ -63,7 +63,8 @@ OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
 		LDAP		"OpenLDAP support"	off \
 		PGSQL		"PostgreSQL support"	off \
 		MYSQL		"MySQL support"		off \
-		SQLITE		"SQLite support"	off
+		SQLITE		"SQLite support"	off \
+		SOLR		"Solr support"		off
 
 .include <bsd.port.pre.mk>
 
@@ -157,6 +158,26 @@ CONFIGURE_ARGS+=--without-sqlite
 PLIST_SUB+=	SQL="@comment "
 .endif
 
+## SOLR support
+#
+.if defined(WITH_SOLR) && !defined(WITHOUT_SOLR)
+USE_SOLR=	yes
+CONFIGURE_ARGS+=--with-solr
+LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
+PLIST_SUB+=	WITHSOLR=""
+SUB_LIST+=	ITHSOLR=""
+.else
+CONFIGURE_ARGS+=--without-solr
+PLIST_SUB+=	WITHSOLR="@comment "
+SUB_LIST+=	WITHSOLR="@comment "
+.endif
+
+.if !defined(NOPORTDOCS)
+PLIST_SUB+=	PORT=""
+.else
+PLIST_SUB+=	PORT="@comment "
+.endif
+
 SUB_LIST=	REQUIRE="${_REQUIRE}"
 SUB_FILES=	pkg-deinstall pkg-message
 
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index a874f04d8ca2..ace017280bcc 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.1.3.tar.gz) = a0becf924b967ade8f319519e3ea0ae527ef749b319a5996407829fd79d56a24
-SIZE (dovecot-2.1.3.tar.gz) = 3724550
+SHA256 (dovecot-2.1.6.tar.gz) = 4b81b2cdf624344c6c2ff91be1b794911b51c98dffa24095a6dcbc7eb6bc1e89
+SIZE (dovecot-2.1.6.tar.gz) = 3773967
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index 1efeb258512b..051670fcb3a4 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -2,7 +2,7 @@
 bin/doveadm
 bin/doveconf
 bin/dsync
-%%PORTDOCS%%%%ETCDIR%%/README
+%%PORT%%%%ETCDIR%%/README
 include/dovecot/abspath.h
 include/dovecot/access-lookup.h
 include/dovecot/anvil-client.h
@@ -379,6 +379,9 @@ lib/dovecot/lib02_imap_acl_plugin.so
 lib/dovecot/lib02_lazy_expunge_plugin.a
 lib/dovecot/lib02_lazy_expunge_plugin.la
 lib/dovecot/lib02_lazy_expunge_plugin.so
+lib/dovecot/lib05_pop3_migration_plugin.a
+lib/dovecot/lib05_pop3_migration_plugin.la
+lib/dovecot/lib05_pop3_migration_plugin.so
 lib/dovecot/lib05_snarf_plugin.a
 lib/dovecot/lib05_snarf_plugin.la
 lib/dovecot/lib05_snarf_plugin.so
@@ -421,6 +424,9 @@ lib/dovecot/lib20_zlib_plugin.so
 lib/dovecot/lib21_fts_squat_plugin.a
 lib/dovecot/lib21_fts_squat_plugin.la
 lib/dovecot/lib21_fts_squat_plugin.so
+%%WITHSOLR%%lib/dovecot/lib21_fts_solr_plugin.a
+%%WITHSOLR%%lib/dovecot/lib21_fts_solr_plugin.la
+%%WITHSOLR%%lib/dovecot/lib21_fts_solr_plugin.so
 lib/dovecot/lib30_imap_zlib_plugin.a
 lib/dovecot/lib30_imap_zlib_plugin.la
 lib/dovecot/lib30_imap_zlib_plugin.so