diff --git a/archivers/zlib-ng/Makefile b/archivers/zlib-ng/Makefile
index dbbf41665de8..7381f615a448 100644
--- a/archivers/zlib-ng/Makefile
+++ b/archivers/zlib-ng/Makefile
@@ -1,17 +1,24 @@
 PORTNAME=	zlib-ng
-DISTVERSION=	2.0.6
+DISTVERSION=	2.1.6
 CATEGORIES=	archivers
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Fork of the zlib data compression library
 WWW=		https://github.com/zlib-ng/zlib-ng
 
 LICENSE=	ZLIB
 
-USES=		cmake:testing
+USES=		cmake compiler:c11
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
-CMAKE_TESTING_ON=	ZLIB_ENABLE_TESTS
+OPTIONS_DEFINE=	SIMD TEST
+
+SIMD_CMAKE_BOOL=	WITH_OPTIM
+TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
+TEST_CMAKE_BOOL=	ZLIB_ENABLE_TESTS ZLIBNG_ENABLE_TESTS
+TEST_BROKEN=		error: use of undeclared identifier 'isascii'
+
+PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/archivers/zlib-ng/distinfo b/archivers/zlib-ng/distinfo
index 4de3df93908a..a0d79fc0e5d0 100644
--- a/archivers/zlib-ng/distinfo
+++ b/archivers/zlib-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641394914
-SHA256 (zlib-ng-zlib-ng-2.0.6_GH0.tar.gz) = 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6
-SIZE (zlib-ng-zlib-ng-2.0.6_GH0.tar.gz) = 817951
+TIMESTAMP = 1708075004
+SHA256 (zlib-ng-zlib-ng-2.1.6_GH0.tar.gz) = a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2
+SIZE (zlib-ng-zlib-ng-2.1.6_GH0.tar.gz) = 2412106
diff --git a/archivers/zlib-ng/pkg-plist b/archivers/zlib-ng/pkg-plist
index 918cedfc800a..8a717a497f44 100644
--- a/archivers/zlib-ng/pkg-plist
+++ b/archivers/zlib-ng/pkg-plist
@@ -1,7 +1,10 @@
 include/zconf-ng.h
 include/zlib-ng.h
+include/zlib_name_mangling-ng.h
+lib/cmake/zlib-ng/zlib-ng-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/zlib-ng/zlib-ng.cmake
 lib/libz-ng.a
 lib/libz-ng.so
 lib/libz-ng.so.2
-lib/libz-ng.so.2.0.6
+lib/libz-ng.so.%%SHLIB_VER%%
 libdata/pkgconfig/zlib-ng.pc