diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index e34d1d25233..f8f433ee5a6 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.76 2021/12/14 07:53:56 giovanni Exp $
+# $OpenBSD: Makefile,v 1.77 2022/03/06 10:54:51 giovanni Exp $
 
 COMMENT-main=		mail delivery agent with filtering abilities
 COMMENT-utils=		quota tools for the Courier mail suite
 
-V=			3.0.3
+V=			3.0.7
 DISTNAME=		maildrop-$V
 PKGNAME-main=		maildrop-$V
 FULLPKGNAME-utils=	courier-utils-$V
@@ -84,11 +84,11 @@ CONFIGURE_ARGS+=	--with-trashquota
 
 LIB_DEPENDS=		devel/libidn \
 			mail/courier-unicode>=2.1 \
-			devel/pcre \
+			devel/pcre2
 
-WANTLIB =		c courier-unicode iconv idn intl pcre>=1
+WANTLIB =		c courier-unicode iconv idn intl pcre2-8
 
-WANTLIB-main=		${WANTLIB} gdbm m ${COMPILER_LIBCXX} pcre>=1 courierauth
+WANTLIB-main=		${WANTLIB} gdbm m ${COMPILER_LIBCXX} pcre2-8 courierauth
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			databases/gdbm \
 			mail/courier-authlib
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 7b9d501f154..f9076be5d7c 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (maildrop-3.0.3.tar.bz2) = CdwX7HBtXSpb3p9ns3uPW/mltqbZrByjvQaYw/Kb/D0=
-SIZE (maildrop-3.0.3.tar.bz2) = 2129162
+SHA256 (maildrop-3.0.7.tar.bz2) = YFzoHDk5BEcy2uRyQhlTTl27UVyAdgvjYRkUq1wfeCU=
+SIZE (maildrop-3.0.7.tar.bz2) = 2129611
diff --git a/mail/maildrop/pkg/PLIST-main b/mail/maildrop/pkg/PLIST-main
index 5a9f34eed68..5ddbe1b0bbd 100644
--- a/mail/maildrop/pkg/PLIST-main
+++ b/mail/maildrop/pkg/PLIST-main
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-main,v 1.8 2018/09/04 12:46:15 espie Exp $
 @pkgpath mail/maildrop
 @newgroup _courier:571
 @newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
@@ -9,6 +8,8 @@
 @owner
 @group
 @bin bin/mailbot
+@bin bin/maildirkw
+@bin bin/maildirwatch
 @owner _courier
 @group _courier
 @bin bin/maildrop
@@ -21,6 +22,8 @@ bin/makedat
 @bin bin/reformime
 @man man/man1/lockmail.1
 @man man/man1/mailbot.1
+@man man/man1/maildirkw.1
+@man man/man1/maildirwatch.1
 @man man/man1/maildrop.1
 @man man/man1/makedat.1
 @man man/man1/makemime.1
@@ -47,6 +50,7 @@ share/doc/maildrop/html/maildiracl.html
 share/doc/maildrop/html/maildirkw.html
 share/doc/maildrop/html/maildirmake.html
 share/doc/maildrop/html/maildirquota.html
+share/doc/maildrop/html/maildirwatch.html
 share/doc/maildrop/html/maildrop.html
 share/doc/maildrop/html/maildropex.html
 share/doc/maildrop/html/maildropfilter.html
diff --git a/mail/maildrop/pkg/PLIST-utils b/mail/maildrop/pkg/PLIST-utils
index 26362dc653a..f4688ce164e 100644
--- a/mail/maildrop/pkg/PLIST-utils
+++ b/mail/maildrop/pkg/PLIST-utils
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-utils,v 1.10 2010/02/26 18:52:57 espie Exp $
 @conflict courier-imap-*
 @pkgpath mail/maildrop,-utils,postfix
 @newgroup _courier:571