diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index c29698a1fbbd..092b3ab0209c 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.2.4
-PORTREVISION=	2
+PORTVERSION=	3.2.5
+#PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	32
@@ -46,9 +46,9 @@ CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
 OPTIONS_DEFINE=		AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
-			MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \
-			DOCS
-OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT
+			MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT SRS \
+			XAPIAN DOCS
+OPTIONS_DEFAULT=	AUTOCREATE IDLED SQLITE SQUAT SRS
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
@@ -84,9 +84,9 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 REPLICATION_DESC=	Enable replication (experimental)
 REPLICATION_CONFIGURE_ENABLE=replication
-#SRS_DESC=		Enable Sender Rewriting Scheme support
-#SRS_CONFIGURE_ENABLE=	srs
-#SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
+SRS_DESC=		Enable Sender Rewriting Scheme support
+SRS_CONFIGURE_ENABLE=	srs
+SRS_LIB_DEPENDS=	libsrs2.so:mail/libsrs2
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
diff --git a/mail/cyrus-imapd32/distinfo b/mail/cyrus-imapd32/distinfo
index ea0a2a64479f..ea79ea9aef0a 100644
--- a/mail/cyrus-imapd32/distinfo
+++ b/mail/cyrus-imapd32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601901004
-SHA256 (cyrus-imapd-3.2.4.tar.gz) = 5161262c382aa5a78c28b1a4f5ea254509dee1e7ade831f7ec9b14078fb42f23
-SIZE (cyrus-imapd-3.2.4.tar.gz) = 12270070
+TIMESTAMP = 1606737895
+SHA256 (cyrus-imapd-3.2.5.tar.gz) = cc386a754e24389b52af837376b3bb6055bea7057f53ec87abca06a8e8d69563
+SIZE (cyrus-imapd-3.2.5.tar.gz) = 12237158
diff --git a/mail/cyrus-imapd32/files/patch-tools__translatesieve b/mail/cyrus-imapd32/files/patch-tools__translatesieve
deleted file mode 100644
index 221306bc994e..000000000000
--- a/mail/cyrus-imapd32/files/patch-tools__translatesieve
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/translatesieve.orig	2020-10-04 23:31:24 UTC
-+++ tools/translatesieve
-@@ -204,6 +204,9 @@ if ($altnamespace > $OPT_WasAlt) {
- chdir $sievedir or die "couldn't change to $sievedir";
- opendir (H, ".");
- while (my $i = readdir H) {
-+    if ($i eq "." || $i eq "..") {
-+        next;
-+    }
-     if (-d $i) {
-         if (! chdir $i) {
-             ouch "couldn't chdir to $i";