diff --git a/x11-wm/oxwm/oxwm-0.11.4.ebuild b/x11-wm/oxwm/oxwm-0.11.4.ebuild
index a242572bd6..d688ccf5a2 100644
--- a/x11-wm/oxwm/oxwm-0.11.4.ebuild
+++ b/x11-wm/oxwm/oxwm-0.11.4.ebuild
@@ -3,64 +3,72 @@
 
 EAPI=8
 
-ZIG_OPTIONAL="1"
-inherit zig
-
 DESCRIPTION="OXWM — DWM but better. Dynamic window manager written in Zig with Lua config"
 HOMEPAGE="https://github.com/tonybanters/oxwm"
 
 COMMIT="f699f6d1ff9e07cdd3831591bda84400e784b2c1"
-SRC_URI="https://github.com/tonybanters/oxwm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+SRC_URI="https://codeload.github.com/tonybanters/oxwm/tar.gz/${COMMIT} -> ${P}.tar.gz"
 
 S="${WORKDIR}/oxwm-${COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-
 KEYWORDS="~amd64"
 
+RESTRICT="mirror"
+
 RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	media-libs/fontconfig
-	media-libs/freetype
-	dev-lang/lua
+    x11-libs/libX11
+    x11-libs/libXft
+    x11-libs/libXinerama
+    media-libs/fontconfig
+    media-libs/freetype
+    dev-lang/lua
 "
 
-DEPEND="${RDEPEND}"
+DEPEND="
+    ${RDEPEND}
+    dev-lang/zig
+"
 
 BDEPEND="
-	${RDEPEND}
-	dev-lang/zig
-	virtual/pkgconfig
+    virtual/pkgconfig
 "
 
+src_unpack() {
+    default
+    local unpacked_dir
+    unpacked_dir=$(find "${WORKDIR}" -maxdepth 1 -type d -name "oxwm-*" | head -n1) || die "Source folder not found"
+    if [[ "${unpacked_dir}" != "${WORKDIR}/${P}" ]]; then
+        mv "${unpacked_dir}" "${WORKDIR}/${P}" || die "Failed to rename source folder"
+    fi
+    S="${WORKDIR}/${P}"
+}
+
 src_configure() {
-	zig_src_configure
+    mkdir -p build
+    cd build || die
+    zig build -Doptimize=ReleaseSmall
 }
 
 src_compile() {
-	zig_src_compile -Doptimize=ReleaseSmall
+    cd build || die
+    zig build -Doptimize=ReleaseSmall
 }
 
 src_install() {
-	zig_src_install
-
-	insinto /usr/share/xsessions
-	doins "${S}/resources/oxwm.desktop" 2>/dev/null || true
-
-	insinto /usr/share/oxwm
-	doins -r "${S}/templates"
-
-	doman "${S}/resources/oxwm.1" 2>/dev/null || true
+    cd build || die
+    zig build install
+    insinto /usr/share/xsessions
+    doins "${S}/resources/oxwm.desktop" 2>/dev/null || true
+    insinto /usr/share/oxwm
+    doins -r "${S}/templates"
+    doman "${S}/resources/oxwm.1" 2>/dev/null || true
 }
 
 pkg_postinst() {
-	elog "OXWM installed successfully!"
-	elog
-	elog "First launch will create ~/.config/oxwm/config.lua"
-	elog "Or manually run: oxwm --init"
-	elog
-	elog "Reload config anytime with: Super + Shift + R"
+    elog "OXWM installed successfully!"
+    elog "First launch will create ~/.config/oxwm/config.lua"
+    elog "Or run: oxwm --init"
 }