diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index c1e6f05567e3..d7c533473c60 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,82 +1,81 @@
 PORTNAME=	gnupg
-DISTVERSION=	2.5.20
-PORTREVISION=	1
+DISTVERSION=	2.5.21
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Complete and free PGP implementation
 WWW=		https://www.gnupg.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL3
 
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libksba.so:security/libksba \
 		libnpth.so:devel/npth
 RUN_DEPENDS=	pinentry:security/pinentry
 
 USES=		compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite \
 		tar:bzip2
 
 CPE_VENDOR=	gnupg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ntbtls
 
 TEST_ARGS=	TESTARGS=--parallel
 TEST_TARGET=	check
 
 CONFLICTS=		dirmngr
 CONFLICTS_INSTALL=	gnupg1-*
 
 INFO=		gnupg
 
 OPTIONS_DEFINE=		DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG \
 			WKS_SERVER
 OPTIONS_DEFAULT=	GNUTLS SCDAEMON WKS_SERVER
 OPTIONS_SUB=		yes
 
 LARGE_RSA_DESC=		Enable support for 8192-bit RSA keys
 LDAP_DESC=		LDAP keyserver interface
 SCDAEMON_DESC=		Enable Smartcard daemon (with libusb)
 SUID_GPG_DESC=		Install GPG as SUID root
 WKS_SERVER_DESC=	Install the Web Key Service server
 
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
 LARGE_RSA_CONFIGURE_ENABLE=	large-secmem
 
 LDAP_USES=		ldap
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 LDAP_LIBS=		-L${LOCALBASE}/lib
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
 
 WKS_SERVER_CONFIGURE_ENABLE=	wks-tools
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MLDAP}
 PLIST_SUB+=	DIRMNGRLDAP=""
 .else
 PLIST_SUB+=	DIRMNGRLDAP="@comment "
 .endif
 
 # Touch the texinfo files to force makeinfo to run.  This fixes Linuxisms in
 # the paths in the man pages.
 pre-build:
 	${TOUCH} ${WRKSRC}/doc/*.texi
 
 post-install:
 	${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 55389fbb5d85..409d6a97566b 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781474478
-SHA256 (gnupg-2.5.20.tar.bz2) = 6461266e99c308419a379abe6c356d54c214136c4589bd65951091138989ffc6
-SIZE (gnupg-2.5.20.tar.bz2) = 8327674
+TIMESTAMP = 1785247524
+SHA256 (gnupg-2.5.21.tar.bz2) = e3af2c8caa46a66a9329fa7c6880af260451914d819595beabc2c26597b31352
+SIZE (gnupg-2.5.21.tar.bz2) = 8351785