diff --git a/x11-wm/oxwm/Manifest b/x11-wm/oxwm/Manifest
index 442b29c629..6158e9f2a6 100644
--- a/x11-wm/oxwm/Manifest
+++ b/x11-wm/oxwm/Manifest
@@ -1 +1,2 @@
+DIST N-V-__8AAKEzFAAA695b9LXBhUSVK5MAV_VKSm1mEj3Acbze.tar.gz 374332 BLAKE2B 472431e5dac4f6d0baf5b4a4720d094079cef8089df40200715ba5e2d7db4e486eaa270d1dd5f14c874f89b36871467572a32ebd319c5f7a7eeffcc529cdcee0 SHA512 875ad1f6df3ba63722b5069564c9d3a4057b4c3564c691061bb49cf6cdf5d2e303f05762bd46797b444aaf992c03021f423df142123eebf86751fd77edaf8060
 DIST oxwm-0.11.4.tar.gz 356901 BLAKE2B 38f040631be4fd8df1e13c8a2e1151c12551b543f14b21f64d562d32f62f73d93c0849692815bc3ec8e15a6b87f73fce2eb24a59ab3837f185fcf457b04c42db SHA512 64e2c1cbb9180576a0a798c0d588d5daf02fe8a39d8ac234fb25e17a5ea3207846e14b958f2212966269c045dd75ff5e8f6bc7768a68f8fa707a074bcedf77d9
diff --git a/x11-wm/oxwm/oxwm-0.11.4.ebuild b/x11-wm/oxwm/oxwm-0.11.4.ebuild
index 956d0b5ed8..aee3adc31f 100644
--- a/x11-wm/oxwm/oxwm-0.11.4.ebuild
+++ b/x11-wm/oxwm/oxwm-0.11.4.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-ZIG_MIN_VERSION="0.15.0"
-ZIG_SLOT="0.15"
-ZIG_INSOURCE_BUILD=1
-
-inherit zig
-
 DESCRIPTION="OXWM — DWM but better. Dynamic window manager written in Zig with Lua config"
 HOMEPAGE="https://github.com/tonybanters/oxwm"
 
+declare -g -r -A ZBS_DEPENDENCIES=(
+	[N-V-__8AAKEzFAAA695b9LXBhUSVK5MAV_VKSm1mEj3Acbze.tar.gz]='https://www.lua.org/ftp/lua-5.4.8.tar.gz'
+)
+
+ZIG_SLOT="0.15"
+inherit zig
+
 COMMIT="f699f6d1ff9e07cdd3831591bda84400e784b2c1"
-SRC_URI="https://codeload.github.com/tonybanters/oxwm/tar.gz/${COMMIT} -> ${P}.tar.gz"
+SRC_URI="https://codeload.github.com/tonybanters/oxwm/tar.gz/${COMMIT} -> ${P}.tar.gz
+	${ZBS_DEPENDENCIES_SRC_URI}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RESTRICT="mirror"
-
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXft
@@ -29,30 +29,36 @@ RDEPEND="
 	media-libs/freetype
 	dev-lang/lua
 "
+
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}"
 
 src_unpack() {
+	zig_src_unpack
+
+	local dir
+	for dir in "${WORKDIR}"/*/; do
+		dir="${dir%/}"
+		[[ -d "${dir}" ]] || continue
+		# skip ZBS hash directories
+		if [[ "${dir}" == *"__8AAKEzF"* ]]; then
+			continue
+		fi
+		if [[ "${dir}" != "${S}" ]]; then
+			mv "${dir}" "${S}" || die "Failed to rename source directory"
+			break
+		fi
+	done
+}
+
+src_prepare() {
+	zig_src_prepare
 	default
-	local unpacked_dir
-	unpacked_dir=$(find "${WORKDIR}" -maxdepth 1 -type d -name "oxwm-*" | head -n1) \
-		|| die "Source folder not found"
-	mv "${unpacked_dir}" "${WORKDIR}/${P}" || die "Failed to rename source folder"
-}
-
-src_configure() {
-	# Use eclass's configure to set up prefix, libc, etc.
-	zig_src_configure
-}
-
-src_compile() {
-	# Build in the source tree (forced by ZIG_INSOURCE_BUILD already,
-	# but explicitly cd there to be safe) with ReleaseSmall.
-	cd "${S}" || die
-	ezig build -Doptimize=ReleaseSmall || die "Build failed"
 }
 
 src_install() {
-	# Let eclass install from the build (it will go to zig-out)
 	zig_src_install
 
 	insinto /usr/share/xsessions