diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 83deb799634..431446e3aa2 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,12 +1,22 @@
-# $OpenBSD: Makefile,v 1.64 2006/11/19 00:40:23 brad Exp $
+# $OpenBSD: Makefile,v 1.65 2006/12/01 23:30:49 jakob Exp $
 
-COMMENT= 	"compact IMAP/POP3 server"
+COMMENT-server= "compact IMAP/POP3 server"
+COMMENT-sieve=	"sieve mail filtering for Dovecot"
 
-DISTNAME=	dovecot-1.0.rc15
+V_DOVECOT=	1.0.rc15
+V_SIEVE=	1.0
+
+PKGNAME-server=	dovecot-${V_DOVECOT}
+PKGNAME-sieve=	dovecot-sieve-${V_SIEVE}
+
+DISTNAME=	dovecot-${V_DOVECOT}
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/
 
-HOMEPAGE=	http://dovecot.org/
+DISTFILES=	dovecot-${V_DOVECOT}.tar.gz \
+		sieve/dovecot-sieve-${V_SIEVE}.tar.gz
+
+HOMEPAGE=	http://www.dovecot.org/
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
@@ -15,46 +25,72 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c crypto ssl z
+
+WANTLIB-server=		c crypto ssl z
+WANTLIB-sieve=
 
 MODULES=	converters/libiconv
 
-FLAVORS+=	ldap mysql postgresql
+MULTI_PACKAGES=	-server
+SUBPACKAGE?=
+
+PSEUDO_FLAVORS=	no_sieve
+FLAVORS=	ldap mysql postgresql
 FLAVOR?=
 
+USE_LIBTOOL=		Yes
+CONFIGURE_STYLE=	autoconf
+AUTOCONF_VERSION=	2.59
+AUTOCONF_DIR=	 	${WRKSRC} 
+CONFIGURE_ARGS+=	--localstatedir=/var \
+			--with-ioloop=kqueue \
+			--with-ssl=openssl \
+			--with-ssldir=/etc/ssl \
+			--without-pam \
+			--without-shadow \
+			--without-vpopmail
+CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+.if !${FLAVOR:L:Mno_sieve}
+MULTI_PACKAGES+=	-sieve
+SIEVE_DIR=		${WRKDIR}/dovecot-sieve-${V_SIEVE}
+AUTOCONF_DIR+=		${SIEVE_DIR}
+RUN_DEPENDS-sieve+=	::mail/dovecot
+.endif
+
 .if ${FLAVOR:L:Mldap}
 CONFIGURE_ARGS+=	--with-ldap
-LIB_DEPENDS+=		lber,ldap::databases/openldap
-WANTLIB+=		sasl2 asn1 com_err gssapi krb5
+LIB_DEPENDS-server+=	lber,ldap::databases/openldap
+WANTLIB-server+=	sasl2 asn1 com_err gssapi krb5
 .endif
 
 .if ${FLAVOR:L:Mmysql}
 CONFIGURE_ARGS+=	--with-mysql
-LIB_DEPENDS+=		lib/mysql/mysqlclient.>=10::databases/mysql
-WANTLIB+=		m
+LIB_DEPENDS-server+=	lib/mysql/mysqlclient.>=10::databases/mysql
+WANTLIB-server+=	m
 .endif
 
 .if ${FLAVOR:L:Mpostgresql}
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq.>=4::databases/postgresql
+LIB_DEPENDS-server+=	pq.>=4::databases/postgresql
 .endif
 
-USE_LIBTOOL=	Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.59
-CONFIGURE_ARGS+=--localstatedir=/var \
-		--with-ioloop=kqueue \
-		--with-ssl=openssl \
-		--with-ssldir=/etc/ssl \
-		--without-pam \
-		--without-shadow \
-		--without-vpopmail
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+.if !${FLAVOR:L:Mno_sieve}
+post-configure:
+	(cd ${WRKSRC}; ${MAKE_PROGRAM} dovecot-config)
+	(cd ${SIEVE_DIR}; ${SETENV} ${CONFIGURE_ENV} \
+		./configure --with-dovecot=${WRKSRC})
+.endif
 
 pre-build:
 	@perl -pi -e s#_PREFIX_#\${PREFIX}#g ${WRKSRC}/dovecot-example.conf
 
+.if !${FLAVOR:L:Mno_sieve}
+post-build:
+	(cd ${SIEVE_DIR}; ${MAKE_PROGRAM} ${MAKE_FLAGS})
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dovecot
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf \
@@ -64,5 +100,11 @@ post-install:
 		${PREFIX}/share/examples/dovecot
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh \
 		${PREFIX}/sbin/dovecot-mkcert.sh
+.if !${FLAVOR:L:Mno_sieve}
+	${INSTALL_DATA} \
+		${SIEVE_DIR}/src/.libs/lib90_cmusieve_plugin.so \
+		${PREFIX}/lib/dovecot
+	ln -s ../lib90_cmusieve_plugin.so ${PREFIX}/lib/dovecot/lda
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 92ca879b295..0f04e95dcd3 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,4 +1,8 @@
 MD5 (dovecot-1.0.rc15.tar.gz) = 26f3d2b075856b1b1d180146363819e6
+MD5 (sieve/dovecot-sieve-1.0.tar.gz) = dabe564d2ef262a008622737ad84579f
 RMD160 (dovecot-1.0.rc15.tar.gz) = 904ef7d1f0fbfe8055f13d9036f7107f498b522e
+RMD160 (sieve/dovecot-sieve-1.0.tar.gz) = b56f5a7391607125184755b9bbcbe749e79e26d4
 SHA1 (dovecot-1.0.rc15.tar.gz) = 9b618d0c1562aa64bd1e055ffa9fe5f2412514af
+SHA1 (sieve/dovecot-sieve-1.0.tar.gz) = 6d151c4140e0cf89e3d771fb32b5da065dbbed24
 SIZE (dovecot-1.0.rc15.tar.gz) = 1463069
+SIZE (sieve/dovecot-sieve-1.0.tar.gz) = 442943
diff --git a/mail/dovecot/pkg/DESCR b/mail/dovecot/pkg/DESCR-server
similarity index 100%
rename from mail/dovecot/pkg/DESCR
rename to mail/dovecot/pkg/DESCR-server
diff --git a/mail/dovecot/pkg/DESCR-sieve b/mail/dovecot/pkg/DESCR-sieve
new file mode 100644
index 00000000000..5289a7da833
--- /dev/null
+++ b/mail/dovecot/pkg/DESCR-sieve
@@ -0,0 +1 @@
+Sieve mail filtering 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/PFRAG.shared b/mail/dovecot/pkg/PFRAG.shared-server
similarity index 88%
rename from mail/dovecot/pkg/PFRAG.shared
rename to mail/dovecot/pkg/PFRAG.shared-server
index 169383d7bec..554d5247d2a 100644
--- a/mail/dovecot/pkg/PFRAG.shared
+++ b/mail/dovecot/pkg/PFRAG.shared-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2006/05/12 19:10:11 brad Exp $
+@comment $OpenBSD: PFRAG.shared-server,v 1.1 2006/12/01 23:30:49 jakob Exp $
 lib/dovecot/imap/lib01_acl_plugin.so
 lib/dovecot/imap/lib01_convert_plugin.so
 lib/dovecot/imap/lib01_quota_plugin.so
diff --git a/mail/dovecot/pkg/PFRAG.shared-sieve b/mail/dovecot/pkg/PFRAG.shared-sieve
new file mode 100644
index 00000000000..966f85a4ae9
--- /dev/null
+++ b/mail/dovecot/pkg/PFRAG.shared-sieve
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared-sieve,v 1.1 2006/12/01 23:30:49 jakob Exp $
+lib/dovecot/lda/lib90_cmusieve_plugin.so
+lib/dovecot/lib90_cmusieve_plugin.so
diff --git a/mail/dovecot/pkg/PLIST b/mail/dovecot/pkg/PLIST-server
similarity index 96%
rename from mail/dovecot/pkg/PLIST
rename to mail/dovecot/pkg/PLIST-server
index 581702071fe..a0f5206c76a 100644
--- a/mail/dovecot/pkg/PLIST
+++ b/mail/dovecot/pkg/PLIST-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2006/07/29 00:24:46 brad Exp $
+@comment $OpenBSD: PLIST-server,v 1.1 2006/12/01 23:30:49 jakob Exp $
 @newgroup _dovecot:518
 @newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
 %%SHARED%%
diff --git a/mail/dovecot/pkg/PLIST-sieve b/mail/dovecot/pkg/PLIST-sieve
new file mode 100644
index 00000000000..3075a5083a3
--- /dev/null
+++ b/mail/dovecot/pkg/PLIST-sieve
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-sieve,v 1.1 2006/12/01 23:30:49 jakob Exp $
+%%SHARED%%