diff --git a/Mk/Uses/zig.mk b/Mk/Uses/zig.mk
--- a/Mk/Uses/zig.mk
+++ b/Mk/Uses/zig.mk
@@ -70,7 +70,11 @@
 .  for z in ${ZIG_TUPLE}
 .    for group url dir in ${z:S/:/ /g:tw}
 	${MAKE} -C ${.CURDIR} do-extract EXTRACT_ONLY=${url:T} WRKDIR=${ZIG_TMPDEPSDIR}
+	@if (set -- "${ZIG_TMPDEPSDIR}"/*; [ "$$#" -gt 1 -o -f "$$1" ]); then \
+  		${MKDIR} ${ZIG_DEPSDIR}/${dir}; \
+  	fi
 	${MV} ${ZIG_TMPDEPSDIR}/* ${ZIG_DEPSDIR}/${dir}
+	${MV} ${ZIG_TMPDEPSDIR}/.* ${ZIG_DEPSDIR}/${dir} || true
 .    endfor
 .  endfor
 	@${RMDIR} ${ZIG_TMPDEPSDIR}