diff --git a/extra-repos/systemd/kwin/0001-kwin-Fix-building-of-tests.patch b/extra-repos/systemd/kwin/0001-kwin-Fix-building-of-tests.patch
new file mode 100644
index 000000000..7020f28b7
--- /dev/null
+++ b/extra-repos/systemd/kwin/0001-kwin-Fix-building-of-tests.patch
@@ -0,0 +1,26 @@
+From a879c59a082707e0e7dfa8ebeb7b239551ec9c71 Mon Sep 17 00:00:00 2001
+From: Bart Ribbers <bribbers@disroot.org>
+Date: Thu, 11 Jan 2024 16:58:52 +0100
+Subject: [PATCH] Fix building of tests on Musl by making sure to include
+ sys/select.h
+
+Required for access to fd_set
+---
+ tests/waylandservertest.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/waylandservertest.cpp b/tests/waylandservertest.cpp
+index d6210be373..1447152306 100644
+--- a/tests/waylandservertest.cpp
++++ b/tests/waylandservertest.cpp
+@@ -16,6 +16,7 @@
+ #include <private/qeventdispatcher_glib_p.h>
+ 
+ #include <iostream>
++#include <sys/select.h>
+ #include <unistd.h>
+ 
+ static int startXServer()
+-- 
+GitLab
+
diff --git a/extra-repos/systemd/kwin/APKBUILD b/extra-repos/systemd/kwin/APKBUILD
index 597265e46..527b59deb 100644
--- a/extra-repos/systemd/kwin/APKBUILD
+++ b/extra-repos/systemd/kwin/APKBUILD
@@ -4,7 +4,7 @@
 # The group tag is just to easily find this APKBUILD by some scripts for automation
 # group=kde-plasma
 pkgname=kwin
-pkgver=9999_git20240428
+pkgver=99996.0.4.1
 _pkgver=6.0.4.1
 pkgrel=0
 pkgdesc="An easy to use, but flexible, composited Window Manager"
@@ -82,14 +82,14 @@ makedepends="$depends_dev
 	"
 checkdepends="xvfb-run"
 
-case "$pkgver" in
+case "$_pkgver" in
 	*.90*) _rel=unstable;;
 	*) _rel=stable;;
 esac
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang"
 _repo_url="https://invent.kde.org/plasma/kwin.git"
 source="https://download.kde.org/stable/plasma/${_pkgver%.*}/kwin-$_pkgver.tar.xz
-	0001-$pkgname-Fix-building-of-tests.patch::https://invent.kde.org/plasma/kwin/-/commit/a879c59a082707e0e7dfa8ebeb7b239551ec9c71.patch
+	0001-kwin-Fix-building-of-tests.patch
 	"
 # Broken, fails to setup due to missing or invalid XDG_RUNTIME_DIR?
 options="!check"
@@ -116,5 +116,5 @@ package() {
 }
 sha512sums="
 a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5  kwin-6.0.4.1.tar.xz
-14c4ddceca2ef51a139319bdd64bc84d7a1df7c6419e86bdbb04572be3212ca46f5c25cd61fa3b511d7644046f92a07408e472e41d95aab93ec494138a09c1a9  0001-kwin-Fix-building-of-tests.patch
+76dbcc01d7863939a1c83bdb730c61ecf939396428fd393be103c0621442143ba46ae366802c99a7cf3b27b67e28dea74e2e72f2511f697bd32bdc85a1bccfdc  0001-kwin-Fix-building-of-tests.patch
 "