diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d2b50d6a8d4..ca9398aff67 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,15 +1,25 @@
-# $OpenBSD: Makefile,v 1.167 2011/05/24 09:40:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.168 2011/05/28 19:40:41 sthen Exp $
 
 SHARED_ONLY=	Yes
 
-COMMENT= compact IMAP/POP3 server
+COMMENT-server=	compact IMAP/POP3 server
+COMMENT-ldap=	LDAP authentication support for Dovecot
+COMMENT-mysql=	MySQL authentication / dictionary support for Dovecot
+COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
+COMMENT-sqlite=	SQLite authentication / dictionary support for Dovecot
 
 # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
 V_MAJOR=	2.0
 V_DOVECOT=	2.0.13
 
 DISTNAME=	dovecot-${V_DOVECOT}
-REVISION=	1
+PKGNAME=	dovecot-${V_DOVECOT}
+PKGNAME-server=	dovecot-${V_DOVECOT}
+REVISION-server= 2
+PKGNAME-ldap=	dovecot-ldap-${V_DOVECOT}
+PKGNAME-mysql=	dovecot-mysql-${V_DOVECOT}
+PKGNAME-postgresql= dovecot-postgresql-${V_DOVECOT}
+PKGNAME-sqlite=	dovecot-sqlite-${V_DOVECOT}
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/${V_MAJOR}/
 
@@ -28,12 +38,16 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	${MODLIBICONV_WANTLIB} bz2 c crypto gssapi krb5 ssl z
+WANTLIB-server=	${MODLIBICONV_WANTLIB} bz2 c crypto gssapi krb5 ssl z
 
 MODULES=	converters/libiconv
 LIB_DEPENDS+=	archivers/bzip2
 
-CPPFLAGS=	-I/usr/include/kerberosV -I${LOCALBASE}/include
+MULTI_PACKAGES=	-server
+SUBPACKAGE?=	-server
+
+PSEUDO_FLAVORS=	no_db no_ldap no_mysql no_postgresql no_sqlite
+FLAVOR?=
 
 USE_LIBTOOL=	Yes
 AUTOCONF_VERSION= 2.67
@@ -41,38 +55,47 @@ CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-gssapi \
 		--with-rundir=/var/dovecot \
+		--with-sql=plugin \
 		--with-statedir=/var/dovecot \
 		--without-pam \
 		--without-shadow \
 		--without-vpopmail
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I/usr/include/kerberosV -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-FLAVORS=	ldap mysql postgresql sqlite
+PSEUDO_FLAVORS=	no_db no_ldap no_mysql no_postgresql no_sqlite
 FLAVOR?=
 
-.if ${FLAVOR:L:Mldap}
-CONFIGURE_ARGS+=--with-ldap
-LIB_DEPENDS+=	databases/openldap
-WANTLIB+=	lber ldap sasl2 asn1 com_err
+.if !${FLAVOR:L:Mno_db} && !${FLAVOR:L:Mno_ldap}
+MULTI_PACKAGES+= -ldap
+CONFIGURE_ARGS+=--with-ldap=plugin
+LIB_DEPENDS-ldap= databases/openldap
+RUN_DEPENDS-ldap= ${BASE_PKGPATH}=${V_DOVECOT}
+WANTLIB-ldap=	asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if !${FLAVOR:L:Mno_db} &&!${FLAVOR:L:Mno_mysql}
+MULTI_PACKAGES+= -mysql
 CONFIGURE_ARGS+=--with-mysql
-LIB_DEPENDS+=	databases/mysql
-WANTLIB+=	m lib/mysql/mysqlclient>=10
+LIB_DEPENDS-mysql= databases/mysql
+RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_DOVECOT}
+WANTLIB-mysql=	crypto m lib/mysql/mysqlclient>=10 ssl z
 .endif
 
-.if ${FLAVOR:L:Mpostgresql}
+.if !${FLAVOR:L:Mno_db} && !${FLAVOR:L:Mno_postgresql}
+MULTI_PACKAGES+= -postgresql
 CONFIGURE_ARGS+=--with-pgsql
-LIB_DEPENDS+=	databases/postgresql
-WANTLIB+=	pq>=4
+LIB_DEPENDS-postgresql=	databases/postgresql
+RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
+WANTLIB-postgresql= com_err crypto pq>=4 ssl
 .endif
 
-.if ${FLAVOR:L:Msqlite}
+.if !${FLAVOR:L:Mno_db} && !${FLAVOR:L:Mno_sqlite}
+MULTI_PACKAGES+= -sqlite
 CONFIGURE_ARGS+=--with-sqlite
-LIB_DEPENDS+=	databases/sqlite3
-WANTLIB+=	sqlite3
+LIB_DEPENDS-sqlite= databases/sqlite3
+RUN_DEPENDS-sqlite= ${BASE_PKGPATH}=${V_DOVECOT}
+WANTLIB-sqlite=	sqlite3 z
 .endif
 
 pre-build:
diff --git a/mail/dovecot/pkg/DESCR b/mail/dovecot/pkg/DESCR
deleted file mode 100644
index 74994a87ea6..00000000000
--- a/mail/dovecot/pkg/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Dovecot is an IMAP and POP3 server for Linux/UNIX-like systems, written
-with security primarily in mind.  Although it's written in C, it uses
-several coding techniques to avoid most of the common pitfalls.  Dovecot
-can work with standard mbox and maildir formats and it's fully 
-compatible with UW-IMAP and Courier IMAP servers as well as mail clients
-accessing the mailboxes directly.
-
-Flavors:
-         ldap - Build with LDAP support as an authentication source
-        mysql - Build with MySQL support as an authentication source
-   postgresql - Build with PostgreSQL support as an authentication source
-       sqlite - Build with SQLite support as an authentication source
diff --git a/mail/dovecot/pkg/DESCR-ldap b/mail/dovecot/pkg/DESCR-ldap
new file mode 100644
index 00000000000..9bc50e85baa
--- /dev/null
+++ b/mail/dovecot/pkg/DESCR-ldap
@@ -0,0 +1 @@
+LDAP authentication support for Dovecot.
diff --git a/mail/dovecot/pkg/DESCR-mysql b/mail/dovecot/pkg/DESCR-mysql
new file mode 100644
index 00000000000..24eab959bec
--- /dev/null
+++ b/mail/dovecot/pkg/DESCR-mysql
@@ -0,0 +1 @@
+MySQL authentication / dictionary support for Dovecot.
diff --git a/mail/dovecot/pkg/DESCR-postgresql b/mail/dovecot/pkg/DESCR-postgresql
new file mode 100644
index 00000000000..11e8bc53cc8
--- /dev/null
+++ b/mail/dovecot/pkg/DESCR-postgresql
@@ -0,0 +1 @@
+PostgreSQL authentication / dictionary support for Dovecot.
diff --git a/mail/dovecot/pkg/DESCR-server b/mail/dovecot/pkg/DESCR-server
new file mode 100644
index 00000000000..28b13052ad5
--- /dev/null
+++ b/mail/dovecot/pkg/DESCR-server
@@ -0,0 +1,6 @@
+Dovecot is an IMAP and POP3 server for Linux/UNIX-like systems, written
+with security primarily in mind.  Although it's written in C, it uses
+several coding techniques to avoid most of the common pitfalls.  Dovecot
+can work with standard mbox and maildir formats and it's fully compatible
+with UW-IMAP and Courier IMAP servers as well as mail clients accessing
+the mailboxes directly.
diff --git a/mail/dovecot/pkg/DESCR-sqlite b/mail/dovecot/pkg/DESCR-sqlite
new file mode 100644
index 00000000000..bb5c4195bee
--- /dev/null
+++ b/mail/dovecot/pkg/DESCR-sqlite
@@ -0,0 +1 @@
+SQLite authentication / dictionary support for Dovecot.
diff --git a/mail/dovecot/pkg/MESSAGE b/mail/dovecot/pkg/MESSAGE-server
similarity index 100%
rename from mail/dovecot/pkg/MESSAGE
rename to mail/dovecot/pkg/MESSAGE-server
diff --git a/mail/dovecot/pkg/PLIST-ldap b/mail/dovecot/pkg/PLIST-ldap
new file mode 100644
index 00000000000..1be9de86964
--- /dev/null
+++ b/mail/dovecot/pkg/PLIST-ldap
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-ldap,v 1.1 2011/05/28 19:40:41 sthen Exp $
+lib/dovecot/auth/libauthdb_ldap.so
diff --git a/mail/dovecot/pkg/PLIST-mysql b/mail/dovecot/pkg/PLIST-mysql
new file mode 100644
index 00000000000..1b5040f6a5c
--- /dev/null
+++ b/mail/dovecot/pkg/PLIST-mysql
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-mysql,v 1.1 2011/05/28 19:40:41 sthen Exp $
+lib/dovecot/auth/libdriver_mysql.so
+lib/dovecot/dict/libdriver_mysql.so
+lib/dovecot/libdriver_mysql.so
diff --git a/mail/dovecot/pkg/PLIST-postgresql b/mail/dovecot/pkg/PLIST-postgresql
new file mode 100644
index 00000000000..f3c47fa93c0
--- /dev/null
+++ b/mail/dovecot/pkg/PLIST-postgresql
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-postgresql,v 1.1 2011/05/28 19:40:41 sthen Exp $
+lib/dovecot/auth/libdriver_pgsql.so
+lib/dovecot/dict/libdriver_pgsql.so
+lib/dovecot/libdriver_pgsql.so
diff --git a/mail/dovecot/pkg/PLIST b/mail/dovecot/pkg/PLIST-server
similarity index 98%
rename from mail/dovecot/pkg/PLIST
rename to mail/dovecot/pkg/PLIST-server
index 8fb0f5147df..0ce7298c289 100644
--- a/mail/dovecot/pkg/PLIST
+++ b/mail/dovecot/pkg/PLIST-server
@@ -1,11 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.23 2011/05/23 23:15:05 sthen Exp $
-@pkgpath mail/dovecot,-server
+@comment $OpenBSD: PLIST-server,v 1.19 2011/05/28 19:40:41 sthen Exp $
+@pkgpath mail/dovecot
 @pkgpath mail/dovecot,-server,bdb
+@pkgpath mail/dovecot,-server,bdb,ldap,mysql,postgresql,sqlite
 @pkgpath mail/dovecot,-server,ldap
 @pkgpath mail/dovecot,-server,mysql
 @pkgpath mail/dovecot,-server,postgresql
 @pkgpath mail/dovecot,-server,sqlite
-@pkgpath mail/dovecot,-server,bdb,ldap,mysql,postgresql,sqlite
+@pkgpath mail/dovecot,ldap,mysql,postgresql,sqlite
+@pkgpath mail/dovecot,ldap
+@pkgpath mail/dovecot,mysql
+@pkgpath mail/dovecot,postgresql
+@pkgpath mail/dovecot,sqlite
 @ask-update dovecot-<2.0 You will need to change your conf
 @newgroup _dovecot:518
 @newgroup _dovenull:666
@@ -336,6 +341,7 @@ include/dovecot/wildcard-match.h
 include/dovecot/write-full.h
 lib/dovecot/
 lib/dovecot/auth/
+lib/dovecot/dict/
 lib/dovecot/doveadm/
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
diff --git a/mail/dovecot/pkg/PLIST-sqlite b/mail/dovecot/pkg/PLIST-sqlite
new file mode 100644
index 00000000000..4f7163c8646
--- /dev/null
+++ b/mail/dovecot/pkg/PLIST-sqlite
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-sqlite,v 1.1 2011/05/28 19:40:41 sthen Exp $
+lib/dovecot/auth/libdriver_sqlite.so
+lib/dovecot/dict/libdriver_sqlite.so
+lib/dovecot/libdriver_sqlite.so