diff --git a/net/zmap/Makefile b/net/zmap/Makefile
index 7a44359a8099..402d92a81287 100644
--- a/net/zmap/Makefile
+++ b/net/zmap/Makefile
@@ -1,54 +1,51 @@
 PORTNAME=	zmap
-PORTVERSION=	2.1.1
+DISTVERSION=	3.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Internet scanner
 WWW=		https://zmap.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	gengetopt>0:devel/gengetopt
 LIB_DEPENDS=	libdnet.so:net/libdnet \
-		libgmp.so:math/gmp
+		libgmp.so:math/gmp \
+		libunistring.so:devel/libunistring
 
 USE_GITHUB=	yes
 
 USES=		cmake:insource pkgconfig
 
+CFLAGS+=	-D_SYSTYPE_BSD
+
 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
 
 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|share/man/man1|man/man1|g' \
 		${WRKSRC}/src/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' \
 		${WRKSRC}/conf/zmap.conf \
 		${WRKSRC}/src/zmap.c
 
-post-install:
-.for m in ${MANPAGE}
-	${GZIP_CMD} ${STAGEDIR}${MANPREFIX}/man/man1/$m
-.endfor
-
 .include <bsd.port.mk>
diff --git a/net/zmap/distinfo b/net/zmap/distinfo
index d00622c974fd..30757c5fff27 100644
--- a/net/zmap/distinfo
+++ b/net/zmap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (zmap-zmap-v2.1.1_GH0.tar.gz) = 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399
-SIZE (zmap-zmap-v2.1.1_GH0.tar.gz) = 131689
+TIMESTAMP = 1688578357
+SHA256 (zmap-zmap-v3.0.0_GH0.tar.gz) = e3151cdcdf695ab7581e01a7c6ee78678717d6a62ef09849b34db39682535454
+SIZE (zmap-zmap-v3.0.0_GH0.tar.gz) = 156278
diff --git a/net/zmap/files/patch-CMakeLists.txt b/net/zmap/files/patch-CMakeLists.txt
deleted file mode 100644
index 868b2bf4d5db..000000000000
--- a/net/zmap/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- CMakeLists.txt.orig	2015-09-11 15:30:41 UTC
-+++ CMakeLists.txt
-@@ -72,6 +72,7 @@ if(WITH_JSON)
-     endif()
- 
-     add_definitions("-DJSON")
-+    string(REPLACE ";" " "  JSON_CFLAGS "${JSON_CFLAGS}")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
- endif()
- 
-@@ -135,11 +136,7 @@ message(STATUS "Default ZMap configuration file locati
- foreach(EACH_CONF ${CONF_FILES})
-     get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
-     message(STATUS "Checking if ${CONF_BASENAME} exists there...")
--    if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}")
--        install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
--    else()
--        message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!")
--    endif()
-+    install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
- endforeach()
- 
- # Allow Debian Packaging
diff --git a/net/zmap/pkg-plist b/net/zmap/pkg-plist
index 8df0187dc389..e68a9f2b8ac7 100644
--- a/net/zmap/pkg-plist
+++ b/net/zmap/pkg-plist
@@ -1,8 +1,10 @@
-%%ETCDIR%%/blacklist.conf
+%%ETCDIR%%/blocklist.conf
 %%ETCDIR%%/zmap.conf
-man/man1/zblacklist.1.gz
+man/man1/zblocklist.1.gz
+man/man1/ziterate.1.gz
 man/man1/zmap.1.gz
 man/man1/ztee.1.gz
-sbin/zblacklist
+sbin/zblocklist
+sbin/ziterate
 sbin/zmap
 sbin/ztee