diff --git a/net/zmap/Makefile b/net/zmap/Makefile
index 57db586c0b7f..ad084e1aea06 100644
--- a/net/zmap/Makefile
+++ b/net/zmap/Makefile
@@ -1,50 +1,67 @@
 PORTNAME=	zmap
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.0.0
-PORTREVISION=	1
+DISTVERSION=	4.1.1
 CATEGORIES=	net
+MASTER_SITES=	SF/judy/judy/Judy-1.0.5/:judy
+DISTFILES=	Judy-1.0.5.tar.gz:judy
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Internet scanner
 WWW=		https://zmap.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	gengetopt>0:devel/gengetopt
+BUILD_DEPENDS=	gengetopt>0:devel/gengetopt \
+		gmake:devel/gmake
 LIB_DEPENDS=	libdnet.so:net/libdnet \
 		libgmp.so:math/gmp \
 		libunistring.so:devel/libunistring
 
+USES=		cmake:insource pkgconfig
 USE_GITHUB=	yes
 
-USES=		cmake:insource pkgconfig
+JUDY_WRKSRC=	${WRKDIR}/judy-1.0.5
+
+CFLAGS+=	-D_SYSTYPE_BSD \
+		-I${JUDY_WRKSRC}/src
+LDFLAGS+=	-L${JUDY_WRKSRC}/src/obj/.libs
 
-CFLAGS+=	-D_SYSTYPE_BSD
+CMAKE_ON=	FORCE_CONF_INSTALL
 
 MANPAGE=	zblacklist.1 zmap.1 ztee.1
 
 OPTIONS_DEFINE=	REDIS MONGO JSON
 OPTIONS_DEFAULT=JSON
 JSON_DESC=	Build with support for JSON
 
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 REDIS_CMAKE_BOOL=	WITH_REDIS
 
 MONGO_LIB_DEPENDS=	libmongoc-1.0.so:devel/mongo-c-driver
 MONGO_CMAKE_BOOL=	WITH_MONGO
 
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
 JSON_CMAKE_BOOL=	WITH_JSON
 
+pre-build: # build the Judy library
+	@cd ${JUDY_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ./configure --disable-shared && \
+		${SETENV} ${MAKE_ENV} ${GMAKE}
+
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|/etc/zmap|${LOCALBASE}/etc/zmap|g' -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -i '' -e 's|/etc/zmap/zmap.conf|${LOCALBASE}/etc/zmap/zmap.conf|g' \
 		${WRKSRC}/src/zopt.ggo.in \
 		${WRKSRC}/src/zmap.c
-	@${REINPLACE_CMD} -i '' -e 's|/etc/zmap/blacklist.conf|${LOCALBASE}/etc/zmap/blacklist.conf|g' \
+	@${REINPLACE_CMD} -i '' -e 's|/etc/zmap/blocklist.conf|${LOCALBASE}/etc/zmap/blocklist.conf|g' \
 		${WRKSRC}/conf/zmap.conf \
 		${WRKSRC}/src/zmap.c
 
+post-install:
+.for cnf in blocklist.conf zmap.conf
+	@${MV} ${STAGEDIR}${ETCDIR}/${cnf} ${STAGEDIR}${ETCDIR}/${cnf}.sample
+.endfor
+
 .include <bsd.port.mk>
diff --git a/net/zmap/distinfo b/net/zmap/distinfo
index 30757c5fff27..e914132ddcd2 100644
--- a/net/zmap/distinfo
+++ b/net/zmap/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1688578357
-SHA256 (zmap-zmap-v3.0.0_GH0.tar.gz) = e3151cdcdf695ab7581e01a7c6ee78678717d6a62ef09849b34db39682535454
-SIZE (zmap-zmap-v3.0.0_GH0.tar.gz) = 156278
+TIMESTAMP = 1716410286
+SHA256 (Judy-1.0.5.tar.gz) = d2704089f85fdb6f2cd7e77be21170ced4b4375c03ef1ad4cf1075bd414a63eb
+SIZE (Judy-1.0.5.tar.gz) = 1147847
+SHA256 (zmap-zmap-v4.1.1_GH0.tar.gz) = b37c4e70e4f9c12091ee10dc7f6f3518cbb7bc291b5b81a451a37632c9440047
+SIZE (zmap-zmap-v4.1.1_GH0.tar.gz) = 202697
diff --git a/net/zmap/pkg-plist b/net/zmap/pkg-plist
index ffe1c97709c1..479300dbed8b 100644
--- a/net/zmap/pkg-plist
+++ b/net/zmap/pkg-plist
@@ -1,10 +1,10 @@
-%%ETCDIR%%/blocklist.conf
-%%ETCDIR%%/zmap.conf
+@sample %%ETCDIR%%/blocklist.conf.sample
+@sample %%ETCDIR%%/zmap.conf.sample
 sbin/zblocklist
 sbin/ziterate
 sbin/zmap
 sbin/ztee
 share/man/man1/zblocklist.1.gz
 share/man/man1/ziterate.1.gz
 share/man/man1/zmap.1.gz
 share/man/man1/ztee.1.gz