diff --git a/security/gnupg25/Makefile b/security/gnupg25/Makefile
index efcfa895898f..1d872bfe9172 100644
--- a/security/gnupg25/Makefile
+++ b/security/gnupg25/Makefile
@@ -1,84 +1,83 @@
 PORTNAME=	gnupg
-DISTVERSION=	2.5.17
+DISTVERSION=	2.5.18
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	25
 
 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
 
-CONFLICTS_INSTALL=	gnupg1-* gnupg-2.4*
-
 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=		dirmngr
+CONFLICTS_INSTALL=	gnupg1-* gnupg-2.4*
 
 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}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2
 	${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/gnupg25/distinfo b/security/gnupg25/distinfo
index ad4774b96b27..ab6f105f9675 100644
--- a/security/gnupg25/distinfo
+++ b/security/gnupg25/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1769640668
-SHA256 (gnupg-2.5.17.tar.bz2) = 2c1fbe20e2958fd8fb53cf37d7c38e84a900edc0d561a1c4af4bc3a10888685d
-SIZE (gnupg-2.5.17.tar.bz2) = 8308629
+TIMESTAMP = 1772133523
+SHA256 (gnupg-2.5.18.tar.bz2) = 0dbd64e0322fe1a4813360d46539d5f8daf4a8fa235cf5fce464e8b0214a7e4f
+SIZE (gnupg-2.5.18.tar.bz2) = 8307830