diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 DISTVERSION=	3.10.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
@@ -24,7 +24,8 @@
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
 		libuuid.so:misc/e2fsprogs-libuuid \
-		libical.so:devel/libical
+		libical.so:devel/libical \
+		libpcre2-posix.so:devel/pcre2
 
 CONFLICTS_INSTALL=	cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
 
@@ -35,11 +36,12 @@
 CONFIGURE_ARGS=	--libexecdir=${CYRUS_PREFIX}/libexec \
 		--sbindir=${CYRUS_PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc \
-		--with-cyrus-user=${CYRUS_USER} \
+		--with-cyrus-user=${USERS} \
 		--with-sasl=${LOCALBASE} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL}
+		--with-perl=${PERL} \
+		--disable-pcre
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
@@ -52,10 +54,10 @@
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
-OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV CLD2 HTTP IDLED JMAP LDAP \
-			MURDER MYSQL NNTP PCRE2 PGSQL REPLICATION SQLITE SQUAT \
+OPTIONS_DEFINE=		AUTOCREATE CLAMAV CLD2 HTTP IDLED JMAP LDAP \
+			MURDER MYSQL NNTP PGSQL REPLICATION SQLITE SQUAT \
 			SRS XAPIAN DOCS
-OPTIONS_DEFAULT=	AUTOCREATE IDLED PCRE2 READLINE_GNU REPLICATION SQLITE \
+OPTIONS_DEFAULT=	AUTOCREATE IDLED READLINE_GNU REPLICATION SQLITE \
 			SQUAT SRS
 .if ${FLAVOR:U} == http
 OPTIONS_DEFAULT+=	HTTP
@@ -63,8 +65,6 @@
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
-BACKUP_DESC=		Enable backup support (experimental)
-BACKUP_CONFIGURE_ENABLE=backup
 CLAMAV_DESC=		Use ClamAV
 CLAMAV_CONFIGURE_WITH=	clamav
 CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
@@ -108,11 +108,6 @@
 MYSQL_CONFIGURE_WITH=	mysql
 NNTP_DESC=		Enable NNTP support
 NNTP_CONFIGURE_ENABLE=	nntp
-PCRE2_DESC=		Use PCRE2 rather than PCRE
-PCRE2_LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
-PCRE2_LIB_DEPENDS_OFF=	libpcre.so:devel/pcre
-PCRE2_CONFIGURE_ON=	--disable-pcre
-PCRE2_CONFIGURE_OFF=	--disable-pcre2
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
@@ -159,21 +154,19 @@
 
 PORTDOCS=	*
 
-SUB_FILES=	pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
+SUB_FILES=	pkg-message cyrus-imapd-man.conf
 
-SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
-
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
+USERS=		cyrus
+GROUPS=		cyrus
 
 MAN_MAN1=	httptest imtest installsieve lmtptest mupdatetest nntptest \
 		pop3test sieveshell sivtest smtptest synctest
 MAN_MAN3=	imclient
 MAN_MAN5=	cyrus.conf imapd.conf krb.equiv
 
-CYRUS_MAN8=	arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
+CYRUS_MAN8=	arbitron chk_cyrus ctl_conversationsdb \
 		ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
-		cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
+		cvt_xlist_specialuse cyr_buildinfo cyr_dbtool \
 		cyr_deny cyr_df cyr_expire cyr_info cyr_ls cyr_synclog \
 		cyr_userseen cyr_virusscan cyradm cyrdump deliver fud idled \
 		imapd ipurge lmtpd lmtpproxyd master mbexamine mbpath mbtool \
diff --git a/mail/cyrus-imapd310/files/pkg-deinstall.in b/mail/cyrus-imapd310/files/pkg-deinstall.in
deleted file mode 100644
--- a/mail/cyrus-imapd310/files/pkg-deinstall.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /usr/sbin/nologin ]; then
-		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-case $2 in
-	DEINSTALL)
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac
diff --git a/mail/cyrus-imapd310/files/pkg-install.in b/mail/cyrus-imapd310/files/pkg-install.in
deleted file mode 100644
--- a/mail/cyrus-imapd310/files/pkg-install.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		echo "*** Failed to update user \`${USER}'."
-	else
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (4190/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac
diff --git a/mail/cyrus-imapd310/pkg-plist b/mail/cyrus-imapd310/pkg-plist
--- a/mail/cyrus-imapd310/pkg-plist
+++ b/mail/cyrus-imapd310/pkg-plist
@@ -10,7 +10,6 @@
 bin/sivtest
 bin/smtptest
 bin/synctest
-%%BACKUP%%cyrus/libexec/backupd
 cyrus/libexec/fud
 %%HTTP%%cyrus/libexec/httpd
 %%IDLED%%cyrus/libexec/idled
@@ -31,7 +30,6 @@
 cyrus/libexec/timsieved
 cyrus/sbin/arbitron
 cyrus/sbin/chk_cyrus
-%%BACKUP%%cyrus/sbin/ctl_backups
 cyrus/sbin/ctl_conversationsdb
 cyrus/sbin/ctl_cyrusdb
 cyrus/sbin/ctl_deliver
@@ -39,7 +37,6 @@
 %%HTTP%%cyrus/sbin/ctl_zoneinfo
 cyrus/sbin/cvt_cyrusdb
 cyrus/sbin/cvt_xlist_specialuse
-%%BACKUP%%cyrus/sbin/cyr_backup
 cyrus/sbin/cyr_buildinfo
 cyrus/sbin/cyr_cd.sh
 cyrus/sbin/cyr_dbtool
@@ -67,7 +64,6 @@
 cyrus/sbin/quota
 cyrus/sbin/reconstruct
 cyrus/sbin/relocate_by_id
-%%BACKUP%%cyrus/sbin/restore
 cyrus/sbin/sievec
 cyrus/sbin/sieved
 %%SQUATTER%%cyrus/sbin/squatter