diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index 92ae5b30d49d..3f16970b5927 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -1,56 +1,56 @@
 # Created by: Daniel Roethlisberger <daniel@roe.ch>
 
 PORTNAME=	dma
-PORTVERSION=	0.13
+DISTVERSION=	0.13.20210614
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	DragonFly Mail Agent, a small MTA for local/outbound mail
 
 LICENSE=	BSD3CLAUSE
 
 USES=		uidfix ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	corecode
+GH_TAGNAME=	430f3b59074d6303ce3eb4d9fcf16dcf3538ba31
 
 BUILD_WRKSRC=	${WRKSRC}/bsd
 INSTALL_WRKSRC=	${WRKSRC}/bsd
 CFLAGS+=	-I${OPENSSLINC} \
 		-DCONF_PATH='\"${PREFIX}/etc/dma\"' \
 		-DDMA_ROOT_USER='\"mailnull\"' \
 		-DDMA_GROUP='\"mail\"'
 LDFLAGS+=	-L${OPENSSLLIB}
 
 MAKE_ENV=	__MAKE_CONF=/dev/null SRCCONF=/dev/null MK_WERROR=no \
 		MANDIR=${PREFIX}/share/man/man
 
 USE_RC_SUBR=	dma_flushq
 SUB_FILES=	pkg-message
 
 # Allow subports to extend.
 CONFFILES+=	dma.conf auth.conf
 
 # 11.x has dma imported into base and /var/spool/dma added to mtree
 PLIST_SUB+=	VARDIR="@comment "
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/dma,${PREFIX}/etc/dma,g' \
 		${WRKSRC}/dma.8
 	@${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \
 		${WRKSRC}/dma.conf
 	@${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN.*/MAN=/' \
 		${WRKSRC}/bsd/dma-mbox-create/Makefile
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/spool/dma
 	${INSTALL_DATA} ${WRKSRC}/dma.conf ${STAGEDIR}${ETCDIR}/dma.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf.sample
 
 .include <bsd.port.mk>
diff --git a/mail/dma/distinfo b/mail/dma/distinfo
index 6f2815ceb01d..b60aadff9969 100644
--- a/mail/dma/distinfo
+++ b/mail/dma/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581003380
-SHA256 (corecode-dma-v0.13_GH0.tar.gz) = 9d4b903f2b750d888f51d668d08d2ea18404dedb0a52cffeb3c81376023c1946
-SIZE (corecode-dma-v0.13_GH0.tar.gz) = 36315
+TIMESTAMP = 1625053870
+SHA256 (corecode-dma-v0.13.20210614-430f3b59074d6303ce3eb4d9fcf16dcf3538ba31_GH0.tar.gz) = e42e8c77691f5aead632dd3d66ceca664c1ad7629d578c300c3cd9ed65f9f0a8
+SIZE (corecode-dma-v0.13.20210614-430f3b59074d6303ce3eb4d9fcf16dcf3538ba31_GH0.tar.gz) = 36383
diff --git a/mail/dma/files/patch-crypto.c b/mail/dma/files/patch-crypto.c
deleted file mode 100644
index 2cf5b29c17ad..000000000000
--- a/mail/dma/files/patch-crypto.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto.c.orig	2021-02-11 13:53:38 UTC
-+++ crypto.c
-@@ -78,7 +78,7 @@ init_cert_file(SSL_CTX *ctx, const char *path)
- 	return (0);
- }
- 
--int
-+static int
- verify_server_fingerprint(const X509 *cert)
- {
- 	unsigned char fingerprint[EVP_MAX_MD_SIZE] = {0};