diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 47b454ce298f..087ca4f44550 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2020/06/02 08:24:14 adam Exp $
+# $NetBSD: Makefile,v 1.70 2020/08/15 10:52:50 tnn Exp $
 
-DISTNAME=	dbmail-3.2.3
-PKGREVISION=	18
+DISTNAME=	dbmail-3.2.5
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_GITHUB:=pjstevns/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dbmail/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST
index 23c317180057..8efc848d9da6 100644
--- a/mail/dbmail/PLIST
+++ b/mail/dbmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/09/12 14:23:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/08/15 10:52:50 tnn Exp $
 ${PLIST.ldap}lib/dbmail/libauth_ldap.la
 lib/dbmail/libauth_sql.la
 lib/dbmail/libdbmail.la
@@ -30,6 +30,7 @@ share/dbmail/sql/mysql/upgrades/32001.mysql
 share/dbmail/sql/mysql/upgrades/32002.mysql
 share/dbmail/sql/mysql/upgrades/32003.mysql
 share/dbmail/sql/mysql/upgrades/32004.mysql
+share/dbmail/sql/mysql/upgrades/32005.mysql
 share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
 share/dbmail/sql/postgresql/2_2-3_0.pgsql
 share/dbmail/sql/postgresql/2_2_5-2_3_0.pgsql
@@ -44,6 +45,7 @@ share/dbmail/sql/postgresql/upgrades/32001.psql
 share/dbmail/sql/postgresql/upgrades/32002.psql
 share/dbmail/sql/postgresql/upgrades/32003.psql
 share/dbmail/sql/postgresql/upgrades/32004.psql
+share/dbmail/sql/postgresql/upgrades/32005.psql
 share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
 share/dbmail/sql/sqlite/2_2-3_0.sqlite
 share/dbmail/sql/sqlite/2_2_5-2_3_0.sqlite
@@ -57,4 +59,8 @@ share/dbmail/sql/sqlite/upgrades/32001.sqlite
 share/dbmail/sql/sqlite/upgrades/32002.sqlite
 share/dbmail/sql/sqlite/upgrades/32003.sqlite
 share/dbmail/sql/sqlite/upgrades/32004.sqlite
+share/dbmail/sql/sqlite/upgrades/32005.sqlite
 share/examples/dbmail/dbmail.conf
+@pkgdir man/man8
+@pkgdir man/man5
+@pkgdir man/man1
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index b59473a9a916..803fb11c9c9b 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2016/02/02 14:31:59 fhajny Exp $
+$NetBSD: distinfo,v 1.18 2020/08/15 10:52:50 tnn Exp $
 
-SHA1 (dbmail-3.2.3.tar.gz) = 63f2c84deb5e0926ac558f8eabc18927a28ca64a
-RMD160 (dbmail-3.2.3.tar.gz) = 1b3276cbd10a0c1659d9efaacb76ebe0c73c9d3c
-SHA512 (dbmail-3.2.3.tar.gz) = 7168fc72c37565c5c40d4fac44c92a19679b14fcd0d66f46f90dd2d00bce33de0bce90f359cef5bb243414924e345bb0044d3a464fd6de55e6459dfcd8e95a2c
-Size (dbmail-3.2.3.tar.gz) = 2444227 bytes
+SHA1 (dbmail-3.2.5.tar.gz) = 64e006365619418834b4f5ca2696c17080800246
+RMD160 (dbmail-3.2.5.tar.gz) = 314bb897d0235f09ad641d05a08ac086e16e4b32
+SHA512 (dbmail-3.2.5.tar.gz) = 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
+Size (dbmail-3.2.5.tar.gz) = 2463966 bytes
 SHA1 (patch-src_dbmail.h.in) = 04feedc90991b5080c6528b01223f190813941a4
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index 1910289042c2..850f58bc50f8 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.12 2015/09/12 14:23:59 tnn Exp $
+# $NetBSD: options.mk,v 1.13 2020/08/15 10:52:50 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
 PKG_SUPPORTED_OPTIONS=	ldap sieve
-PKG_SUGGESTED_OPTIONS=	sieve
+PKG_SUGGESTED_OPTIONS=	ldap sieve
 
 .include "../../mk/bsd.options.mk"
 
@@ -18,6 +18,7 @@ PLIST.sieve=		yes
 FILES_SUBST+=		TIMSIEVED="dbmailtimsieved"
 RCD_SCRIPTS+=		dbmailtimsieved
 .else
+CONFIGURE_ARGS+=	--without-sieve
 FILES_SUBST+=		TIMSIEVED=""
 .endif
 
@@ -28,4 +29,6 @@ FILES_SUBST+=		TIMSIEVED=""
 .include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
 PLIST.ldap=		yes
+.else
+CONFIGURE_ARGS+=	--without-ldap
 .endif