diff --git a/lang/zig/Makefile b/lang/zig/Makefile
index 62a5af4139f3..4e86abb5c846 100644
--- a/lang/zig/Makefile
+++ b/lang/zig/Makefile
@@ -1,79 +1,75 @@
 PORTNAME=	zig
-DISTVERSION=	0.14.0
+DISTVERSION=	0.15.2
 CATEGORIES=	lang
 MASTER_SITES=	https://ziglang.org/download/${DISTVERSION}/ \
 		https://ziglang.org/builds/
 
 PATCH_SITES=	https://github.com/ziglang/${PORTNAME}/commit/
 
 MAINTAINER=	bsd@orsolic.org
 COMMENT=	Language designed for robustness, optimality, and maintainability
 WWW=		https://ziglang.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	not yet supported
 
-BUILD_DEPENDS=	icu>=71:devel/icu \
-		llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
+BUILD_DEPENDS=	llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++11-lang localbase:ldflags tar:xz
 CMAKE_ARGS+=	-DZIG_TARGET_MCPU=baseline # ensure we run everywhere
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${_LLVM_VER}
 CMAKE_ON=	THREADS_PREFER_PTHREAD_FLAG
 
 CONFLICTS_INSTALL=	zig0*
 
 OPTIONS_DEFINE=		DOCS STATIC
 OPTIONS_DEFAULT=	DOCS
 
 STATIC_DESC=	sets ZIG_STATIC to avoid 800MiB LLVM runtime dependency
 
 STATIC_RUN_DEPENDS_OFF=	llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
 STATIC_CMAKE_BOOL=	ZIG_STATIC
 STATIC_LDFLAGS=		-licudata -licuuc -llzma -lm -lmd -lxml2 -lz -lzstd
 STATIC_LIB_DEPENDS+=	libxml2.so:textproc/libxml2
 
-_LLVM_VER=	19
+_LLVM_VER=	20
 _ZIG_BIN=	${STAGEDIR}${PREFIX}/bin/zig
 
 post-configure-STATIC-on:
 	@${REINPLACE_CMD} 's/-Wl,-Bdynamic//' \
 		${BUILD_WRKSRC}/build.ninja
 
 post-install:
-	@${RM} -rf ${WRKDIR}/.build
+	# Zig install creates this dir, which causes check-plist error
 	@${RM} -rf ${STAGEDIR}/wrkdirs
+
 	# Automatically create the PLIST file
 	@${FIND} -s ${_ZIG_BIN} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${PREFIX}/lib/${PORTNAME} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/compress/flate/testdata/block_writer" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/compress/flate/testdata/fuzz" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/compress/lzma/testdata" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/compress/testdata" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/compress/xz/testdata" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/tar/testdata" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir lib/zig/std/tz" >> ${TMPPLIST}
+	@${FIND} -s ${STAGEDIR}${PREFIX}/lib/${PORTNAME} -type d -empty | ${SORT} | \
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##; s#^#@dir #' >> ${TMPPLIST}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/std
 .for f in index.html main.js
 	${INSTALL_MAN} ${WRKSRC}/lib/docs/${f} \
 		${STAGEDIR}${DOCSDIR}/${f}
 .endfor
 	@cd ${STAGEDIR}; ${FIND} ${DOCSDIR:C@^/@@} -type f | ${SED} -e 's@^@/@' | ${SORT} | \
 		${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir share/doc/zig/std" >> ${TMPPLIST}
 
 do-test:
-	mkdir ${WRKDIR}/cache
+	mkdir -p ${WRKDIR}/cache
 	(cd ${WRKSRC} && \
 		${_ZIG_BIN} build test-behavior --cache-dir ${WRKDIR}/cache \
 		--global-cache-dir ${WRKDIR}/cache --zig-lib-dir ${WRKSRC}/lib)
 
 .include <bsd.port.mk>
diff --git a/lang/zig/distinfo b/lang/zig/distinfo
index 9e8edfca8f10..7b8de6171f6e 100644
--- a/lang/zig/distinfo
+++ b/lang/zig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744681910
-SHA256 (zig-0.14.0.tar.xz) = c76638c03eb204c4432ae092f6fa07c208567e110fbd4d862d131a7332584046
-SIZE (zig-0.14.0.tar.xz) = 17772188
+TIMESTAMP = 1761276338
+SHA256 (zig-0.15.2.tar.xz) = d9b30c7aa983fcff5eed2084d54ae83eaafe7ff3a84d8fb754d854165a6e521c
+SIZE (zig-0.15.2.tar.xz) = 21366268