diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 7617159176a..6cb92885da5 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2007/03/15 23:20:54 jakob Exp $
+# $OpenBSD: Makefile,v 1.74 2007/03/22 06:59:13 jakob Exp $
 
 SHARED_ONLY=	Yes
 
@@ -10,8 +10,8 @@ V_DOVECOT=	1.0.rc27
 V_SIEVE=	1.0
 
 PKGNAME=	dovecot-${V_DOVECOT}
-PKGNAME-server=	dovecot-${V_DOVECOT}
-PKGNAME-sieve=	dovecot-sieve-${V_SIEVE}p4
+PKGNAME-server=	dovecot-${V_DOVECOT}p0
+PKGNAME-sieve=	dovecot-sieve-${V_SIEVE}p5
 
 DISTNAME=	dovecot-${V_DOVECOT}
 CATEGORIES=	mail
@@ -39,7 +39,7 @@ MULTI_PACKAGES=	-server
 SUBPACKAGE?=	-server
 
 PSEUDO_FLAVORS=	no_sieve
-FLAVORS=	ldap mysql postgresql
+FLAVORS=	ldap mysql postgresql sqlite
 FLAVOR?=
 
 USE_LIBTOOL=		Yes
@@ -79,6 +79,11 @@ CONFIGURE_ARGS+=	--with-pgsql
 LIB_DEPENDS+=		pq.>=4::databases/postgresql
 .endif
 
+.if ${FLAVOR:L:Msqlite}
+CONFIGURE_ARGS+=	--with-sqlite
+LIB_DEPENDS+=		sqlite3::databases/sqlite3
+.endif
+
 .if !${FLAVOR:L:Mno_sieve}
 post-configure:
 	(cd ${WRKSRC}; ${MAKE_PROGRAM} dovecot-config)
diff --git a/mail/dovecot/pkg/DESCR-server b/mail/dovecot/pkg/DESCR-server
index e4de60b70c1..2fe79120957 100644
--- a/mail/dovecot/pkg/DESCR-server
+++ b/mail/dovecot/pkg/DESCR-server
@@ -10,3 +10,4 @@ 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