diff --git a/security/nmap-devel/Makefile b/security/nmap-devel/Makefile
index bb422f6f83ca..b315ae34f7da 100644
--- a/security/nmap-devel/Makefile
+++ b/security/nmap-devel/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	nmap
 PORTVERSION=	7.95.${NMAP_COMMIT_DATE}
 PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER?=	cy@FreeBSD.org
 COMMENT?=	Port scanning utility for large networks
 WWW=		https://nmap.org/
 
 # nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
 # https://nmap.org/book/man-legal.html
 # Install the nmap modified license because of
 # http://insecure.org/news/download-com-fiasco.html
 LICENSE=	NPSL
 LICENSE_NAME=	Nmap Public Source License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror pkg-sell
 
 IGNORE_FreeBSD_13=	 Does not build on FreeBSD 13.x due to OpenSSL 1.1.1
 
 LIB_DEPENDS=	libpcre2-16.so:devel/pcre2
 
 .if !defined(MASTERDIR)
 
 USES=		gmake cpe libtool
 
 # XXX limit results if we do a grep in the sources!
 EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/mswin32 \
 			--no-same-owner --no-same-permissions
 
 USE_GITHUB=	yes
-GH_TAGNAME=	a5b332ccd
-NMAP_COMMIT_DATE=	20260128
+GH_TAGNAME=	b64e0cb9f
+NMAP_COMMIT_DATE=	20260323
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--without-localdirs \
 		--without-zenmap \
 		--without-ndiff \
 		--with-libpcre=${LOCALBASE} \
 		--with-liblua=included \
 		--without-nmap-update
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS NLS PCAP SSH2 SSL
 OPTIONS_DEFAULT=NLS SSH2 SSL
 OPTIONS_SUB=	yes
 
 PCAP_DESC=		Build with libpcap from nmap
 SSH2_DESC=		SSH2 protocol support
 
 NLS_CONFIGURE_ENABLE=	nls
 PCAP_CONFIGURE_ON=	--with-libpcap=included
 PCAP_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 PCAP_USES=		localbase:ldflags
 PCAP_LDFLAGS=		-ldbus-1
 SSH2_IMPLIES=		SSL
 SSH2_CONFIGURE_ON=	--with-libssh2=included
 SSH2_CONFIGURE_OFF=	--without-libssh2
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_CONFIGURE_OFF=	--without-openssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 SSL_VARS=		STRIP_FILES+=ncat
 
 DOCS=	CHANGELOG HACKING
 STRIP_FILES+=	nmap nping
 
 .include <bsd.port.options.mk>
 
 .if defined(SSL_DEFAULT) && ${SSL_DEFAULT} == libressl
 BROKEN=	error: OpenSSL-1.1.1 is the minimum supported version. LibreSSLis not supported
 .endif
 
 .if exists(/usr/lib/libibverbs.a)
 # Link with libibverbs is needed by static libpcap
 post-patch-PCAP-on:
 	@${REINPLACE_CMD} -E -e "s|(PCAP_LIBS=['\"].*)(['\"])$$|\1 -libverbs\2|" \
 		${WRKSRC}/configure \
 		${WRKSRC}/nping/configure \
 		${WRKSRC}/ncat/configure
 .endif
 
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
 pre-install:
 	${FIND} ${WRKSRC} -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S|^|${STAGEDIR}${PREFIX}/bin/|}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/nmap-devel/distinfo b/security/nmap-devel/distinfo
index 75e3644a2dd5..ce924e0e950f 100644
--- a/security/nmap-devel/distinfo
+++ b/security/nmap-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1769626522
-SHA256 (nmap-nmap-7.95.20260128-a5b332ccd_GH0.tar.gz) = 1ece1e448c907a8e771732688720d5b7d1dc61a38833c9944ef6dfbe5b904377
-SIZE (nmap-nmap-7.95.20260128-a5b332ccd_GH0.tar.gz) = 15953285
+TIMESTAMP = 1774455723
+SHA256 (nmap-nmap-7.95.20260323-b64e0cb9f_GH0.tar.gz) = ffd94684626d5bbd65a452a5d5f84827395a4be59e28f463a57eb11730205cd1
+SIZE (nmap-nmap-7.95.20260323-b64e0cb9f_GH0.tar.gz) = 16782673
diff --git a/security/nmap-devel/files/patch-libdnet-stripped_configure b/security/nmap-devel/files/patch-libdnet-stripped_configure
deleted file mode 100644
index 3ac064bb4dc8..000000000000
--- a/security/nmap-devel/files/patch-libdnet-stripped_configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- libdnet-stripped/configure.orig	2025-08-09 12:07:16.000000000 -0700
-+++ libdnet-stripped/configure	2026-02-02 15:30:56.588281000 -0800
-@@ -643,6 +643,9 @@
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-+#ifdef HAVE_SYS_SOCKET_H
-+# include <sys/socket.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-@@ -15136,13 +15139,6 @@
-     if test ${ac_cv_dnet_bsd_bpf+y}
- then :
-   printf %s "(cached) " >&6
--else case e in #(
--  e) if test -c /dev/bpf -o -c /dev/bpf0 ; then
--        ac_cv_dnet_bsd_bpf=yes
--    else
--        ac_cv_dnet_bsd_bpf=no
--    fi ;;
--esac
- fi
- 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dnet_bsd_bpf" >&5
diff --git a/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c b/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c
deleted file mode 100644
index f7adb16d22d2..000000000000
--- a/security/nmap-devel/files/patch-libdnet-stripped_src_intf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdnet-stripped/src/intf.c.orig	2025-03-31 12:30:47.000000000 -0700
-+++ libdnet-stripped/src/intf.c	2026-02-02 15:34:47.918928000 -0800
-@@ -178,7 +178,7 @@
- #if defined(SIOCGLIFCONF) || defined(SIOCGIFNETMASK_IN6) || defined(SIOCGIFNETMASK6)
- 		if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- #  ifdef EPROTONOSUPPORT
--			if (errno != EPROTONOSUPPORT)
-+			if (errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT)
- #endif
- 				return (intf_close(intf));
- 		}