diff --git a/security/nmap-devel/Makefile b/security/nmap-devel/Makefile
index 7ee1dab99bad..2a451e120a57 100644
--- a/security/nmap-devel/Makefile
+++ b/security/nmap-devel/Makefile
@@ -1,100 +1,100 @@
 PORTNAME=	nmap
 PORTVERSION=	7.100.${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
 
 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=	6dac43b5d
-NMAP_COMMIT_DATE=	20260327
+GH_TAGNAME=	806c0af5e
+NMAP_COMMIT_DATE=	20260619
 
 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)
 .if ${SSL_DEFAULT} == libressl
 BROKEN=	error: OpenSSL-3.0.0 is the minimum supported version. LibreSSLis not supported
 .endif
 .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 8cf9abb2d623..0df00dde7d8c 100644
--- a/security/nmap-devel/distinfo
+++ b/security/nmap-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774753021
-SHA256 (nmap-nmap-7.100.20260327-6dac43b5d_GH0.tar.gz) = cf7654e72d10e1f9fb7865f02c58fd651f41272864a0adbf842654fc08095568
-SIZE (nmap-nmap-7.100.20260327-6dac43b5d_GH0.tar.gz) = 16782414
+TIMESTAMP = 1781885098
+SHA256 (nmap-nmap-7.100.20260619-806c0af5e_GH0.tar.gz) = d8d7d6589704226fb00ad9b7660fae9c2aafc3c3380ab3dbfbe36a7632e44901
+SIZE (nmap-nmap-7.100.20260619-806c0af5e_GH0.tar.gz) = 16690418
diff --git a/security/nmap-devel/files/patch-ncat__ncat_ssl.c b/security/nmap-devel/files/patch-ncat__ncat_ssl.c
deleted file mode 100644
index 59468e4b465b..000000000000
--- a/security/nmap-devel/files/patch-ncat__ncat_ssl.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ncat/ncat_ssl.c.orig	2022-08-29 17:09:47 UTC
-+++ ncat/ncat_ssl.c
-@@ -73,7 +73,9 @@
- #include <openssl/x509.h>
- #include <openssl/x509v3.h>
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-+    ((!defined LIBRESSL_VERSION_NUMBER) || \
-+    (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L))
- #define HAVE_OPAQUE_STRUCTS 1
- #define FUNC_ASN1_STRING_data ASN1_STRING_get0_data
- #else