diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index da89e93fc2e4..ca13f0c944f9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,83 +1,84 @@
 PORTNAME=	gnupg
 DISTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 PATCH_SITES=	https://github.com/gpg/${PORTNAME}/commit/
 PATCHFILES+=	9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch:-p1 #Fix linking without LDAP
 
 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
 
 CONFLICTS=	dirmngr
 CPE_VENDOR=	gnupg
 
 CONFIGURE_ARGS=	--disable-ntbtls --enable-gpg-is-gpg2
 GNU_CONFIGURE=	yes
 INFO=		gnupg
 TEST_TARGET=	check
 TEST_ARGS=	TESTARGS=--parallel
 
 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_CONFIGURE_ENABLE=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 LARGE_RSA_CONFIGURE_ENABLE=	large-secmem
 
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 LDAP_LIBS=		-L${LOCALBASE}/lib
 LDAP_USES=		ldap
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 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}
 
 # Necessary because of --enable-gpg-is-gpg2
 pre-test:
 	${LN} -s gpg ${WRKSRC}/bin/gpg2
 
 .include <bsd.port.mk>
diff --git a/security/gnupg/files/patch-dirmngr_Makefile.in b/security/gnupg/files/patch-dirmngr_Makefile.in
new file mode 100644
index 000000000000..96607396e75d
--- /dev/null
+++ b/security/gnupg/files/patch-dirmngr_Makefile.in
@@ -0,0 +1,12 @@
+--- dirmngr/Makefile.in.orig	2023-07-04 14:09:03 UTC
++++ dirmngr/Makefile.in
+@@ -719,8 +719,8 @@ dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN
+ @USE_LDAP_FALSE@ldaplibs = 
+ @USE_LDAP_TRUE@ldaplibs = $(LDAPLIBS)
+ dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
+-	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+ 	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
++	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+ 	$(NETLIBS) $(dirmngr_rc_objs) $(am__append_11)
+ dirmngr_LDFLAGS = 
+ dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)