diff --git a/devel/level-zero/Makefile b/devel/level-zero/Makefile
index de0ccebb60fd..df73b19a7bd0 100644
--- a/devel/level-zero/Makefile
+++ b/devel/level-zero/Makefile
@@ -1,31 +1,38 @@
 PORTNAME=	level-zero
-PORTVERSION=	1.17.45
+PORTVERSION=	1.21.9
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	oneAPI Level Zero Specification Headers and Loader
 WWW=		https://spec.oneapi.io/versions/latest/elements/l0/source/index.html \
 		https://github.com/oneapi-src/level-zero
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog
 
 USES=		cmake compiler:c++14-lang localbase:ldflags pathfix
 
+CMAKE_OFF=	BUILD_INSTALLER \
+		BUILD_L0_LOADER_TESTS \
+		BUILD_STATIC \
+		USE_ASAN
+CMAKE_ON=	SYSTEM_SPDLOG
 CXXFLAGS+=	-DSPDLOG_FMT_EXTERNAL
 LDFLAGS+=	-lfmt
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	oneapi-src
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION:E} > ${WRKSRC}/VERSION_PATCH
+# Clean up bundled libraries
+	@${RM} -r ${WRKSRC}/third_party/spdlog_headers
 
 .include <bsd.port.mk>
diff --git a/devel/level-zero/distinfo b/devel/level-zero/distinfo
index d3d2d51035d1..2474427892c3 100644
--- a/devel/level-zero/distinfo
+++ b/devel/level-zero/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727718400
-SHA256 (oneapi-src-level-zero-v1.17.45_GH0.tar.gz) = c7e4d3e98ee71ba4992f5891191fa792e0affe6da2bbb93a537b192eb0d24f57
-SIZE (oneapi-src-level-zero-v1.17.45_GH0.tar.gz) = 1152376
+TIMESTAMP = 1745177900
+SHA256 (oneapi-src-level-zero-v1.21.9_GH0.tar.gz) = ba543a01adbcbd241518c3eee80b75414094d1fd3efcde9ff2693196cea4d057
+SIZE (oneapi-src-level-zero-v1.21.9_GH0.tar.gz) = 975670
diff --git a/devel/level-zero/files/patch-source-utils-logging.h b/devel/level-zero/files/patch-source-utils-logging.h
new file mode 100644
index 000000000000..be4fd8e2d421
--- /dev/null
+++ b/devel/level-zero/files/patch-source-utils-logging.h
@@ -0,0 +1,21 @@
+--- source/utils/logging.h.orig	2025-04-10 20:05:03 UTC
++++ source/utils/logging.h
+@@ -29,11 +29,9 @@
+ #include "ze_api.h"
+ #include "ze_util.h"
+ 
+-#ifdef __linux__
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+-#endif // __linux__
+ 
+ namespace loader {
+ 
+@@ -235,4 +233,4 @@ inline std::shared_ptr<Logger> createLogger() {
+ 
+ } // namespace loader
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/devel/level-zero/pkg-plist b/devel/level-zero/pkg-plist
index 19b4cd6829bf..66ba82713995 100644
--- a/devel/level-zero/pkg-plist
+++ b/devel/level-zero/pkg-plist
@@ -1,21 +1,22 @@
 include/level_zero/layers/zel_tracing_api.h
 include/level_zero/layers/zel_tracing_ddi.h
 include/level_zero/layers/zel_tracing_register_cb.h
 include/level_zero/loader/ze_loader.h
 include/level_zero/ze_api.h
 include/level_zero/ze_ddi.h
+include/level_zero/ze_ddi_common.h
 include/level_zero/zes_api.h
 include/level_zero/zes_ddi.h
 include/level_zero/zet_api.h
 include/level_zero/zet_ddi.h
 lib/libze_loader.so
 lib/libze_loader.so.1
 lib/libze_loader.so.%%PORTVERSION%%
 lib/libze_tracing_layer.so
 lib/libze_tracing_layer.so.1
 lib/libze_tracing_layer.so.%%PORTVERSION%%
 lib/libze_validation_layer.so
 lib/libze_validation_layer.so.1
 lib/libze_validation_layer.so.%%PORTVERSION%%
 libdata/pkgconfig/level-zero.pc
 libdata/pkgconfig/libze_loader.pc