diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index b3db87fea697..56cb26774cee 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,82 +1,80 @@
 PORTNAME=	mimedefang
-PORTVERSION=	2.84
-PORTREVISION=	2
+PORTVERSION=	2.86
 
 CATEGORIES=	mail
-MASTER_SITES=	http://www.mimedefang.org/static/ \
-		http://fossies.org/linux/misc/
+MASTER_SITES=	https://mimedefang.org/releases/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Milter based anti-spam and anti-virus filtering program
 WWW=		https://www.mimedefang.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
 	p5-IO-Stringy>=0:devel/p5-IO-Stringy \
 	p5-MIME-Tools>=5.417:mail/p5-MIME-Tools \
 	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 	spamassassin>=3.0:mail/spamassassin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cpe perl5 shebangfix
 perl_OLD_CMD=	perl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
 			--with-confsubdir=mimedefang \
 			--with-user=${MIMEDEFANG_USER} \
 			--with-spooldir=${SPOOLDIR} \
 			--with-quarantinedir=${QUARANTINEDIR} \
 			--with-ipheader \
 			--prefix=${PREFIX}
 CONFIGURE_ENV+=		PERL=${PERL}
 
 SUB_FILES=	pkg-message
 
 PLIST_SUB+=	USER="${MIMEDEFANG_USER}" \
 		GROUP="${MIMEDEFANG_GROUP}" \
 		MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
 		MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"
 
 MIMEDEFANG_USER?=	mailnull
 MIMEDEFANG_GROUP?=	mailnull
 SPOOLDIR?=		/var/spool/MIMEDefang
 QUARANTINEDIR?=		/var/spool/MD-Quarantine
 CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 
 OPTIONS_DEFINE=	CLAMAV DOCS EXAMPLES
 OPTIONS_DEFAULT=	CLAMAV
 
 CLAMAV_DESC=	Enable Clamav
 
 CLAMAV_BUILD_DEPENDS=		clamscan:security/clamav
 CLAMAV_RUN_DEPENDS=		clamscan:security/clamav
 CLAMAV_CONFIGURE_ENABLE=	antivirus clamav clamd
 
 .include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 CONFIGURE_ARGS+=	--with-milterinc=${MILTERBASE}/include --with-milterlib=${MILTERBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/fgrep -e/d' ${WRKSRC}/configure
 
 pre-install:
 	@${REINPLACE_CMD} -e '/LOCAL_STATE_DIR/s,/var/lib,/var/db,' ${WRKSRC}/mimedefang.pl
 
 post-install:
 	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
 		suggested-minimum-filter-for-windows-clients README ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 0d497b8ab867..6cb837f3deee 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610741610
-SHA256 (mimedefang-2.84.tar.gz) = 6d1531c70a901fcddf9cb989d488beaf78ac0cc16d11beb981b99200146c4848
-SIZE (mimedefang-2.84.tar.gz) = 371596
+TIMESTAMP = 1675152681
+SHA256 (mimedefang-2.86.tar.gz) = 8ee9a0397cbea447ed252dee128baa47a3d6b3b2a9620931f9c5cecca0321a23
+SIZE (mimedefang-2.86.tar.gz) = 501484
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index 5dfd868b13d3..6aafb9d8ffd7 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -1,34 +1,31 @@
 bin/md-mx-ctrl
 bin/mimedefang
 bin/mimedefang-multiplexor
 bin/mimedefang-util
 bin/mimedefang.pl
 bin/watch-mimedefang
 bin/watch-multiple-mimedefangs.tcl
 etc/rc.d/mimedefang
 man/man1/mimedefang-util.1.gz
 man/man5/mimedefang-filter.5.gz
 man/man7/mimedefang-notify.7.gz
 man/man7/mimedefang-protocol.7.gz
 man/man8/md-mx-ctrl.8.gz
 man/man8/mimedefang-multiplexor.8.gz
 man/man8/mimedefang.8.gz
 man/man8/mimedefang.pl.8.gz
 man/man8/watch-mimedefang.8.gz
 man/man8/watch-multiple-mimedefangs.8.gz
 @sample %%ETCDIR%%/mimedefang-filter.sample
 @sample %%ETCDIR%%/mimedefang-ip-key.sample
 @sample %%ETCDIR%%/sa-mimedefang.cf.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/README.NONROOT
 %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE
 %%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
-%%PORTDOCS%%%%DOCSDIR%%/README.TRU64
-%%PORTDOCS%%%%DOCSDIR%%/README.VEXIRA
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
 @dir(%%USER%%,%%GROUP%%,700) %%MIMEDEFANG_QUARANTINEDIR%%
 @dir(%%USER%%,%%GROUP%%,710) %%MIMEDEFANG_RUNDIR%%