diff --git a/qubes-vm-gui/0001-initd-fix.patch b/qubes-vm-gui/0001-initd-fix.patch
index 7bb8a3c..bad5c33 100644
--- a/qubes-vm-gui/0001-initd-fix.patch
+++ b/qubes-vm-gui/0001-initd-fix.patch
@@ -1,22 +1,13 @@
-From 7f7914fc2d0957012f1c4b130b0e442d43110c7d Mon Sep 17 00:00:00 2001
-From: "build@apk-groulx" <build@apk-groulx.praxis>
-Date: Sat, 5 Mar 2022 00:59:30 +0000
-Subject: [PATCH 1/1] initd fix
-
----
- appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh b/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh
-index dc0a578..4c9623a 100755
---- a/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh
+diff --git a/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh.orig b/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh
+index 76e0227..268cb00 100755
+--- a/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh.orig
 +++ b/appvm-scripts/usr/lib/qubes/qubes-gui-agent-pre.sh
-@@ -23,4 +23,4 @@ if [ -n "$debug_mode" ] && [ "$debug_mode" -gt 0 ]; then
+@@ -25,7 +25,7 @@ if [ -n "$debug_mode" ] && [ "$debug_mode" -gt 0 ]; then
      gui_opts="$gui_opts -vv"
  fi
  
 -echo "GUI_OPTS=$gui_opts" >> /var/run/qubes-service-environment
 +echo "GUI_OPTS=\"$gui_opts\"" >> /var/run/qubes-service-environment
--- 
-2.34.1
-
+ 
+ # 2**30
+ echo 1073741824 > /sys/module/xen_gntalloc/parameters/limit
diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD
index 316a2cb..3d259df 100644
--- a/qubes-vm-gui/APKBUILD
+++ b/qubes-vm-gui/APKBUILD
@@ -2,8 +2,11 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 
 pkgname=qubes-vm-gui
-subpackages="qubes-vm-pulseaudio $pkgname-openrc"
-pkgver=4.1.31
+subpackages="
+	qubes-vm-pulseaudio
+	qubes-vm-pipewire
+	$pkgname-openrc"
+pkgver=4.2.8
 pkgrel=0
 _gittag="v$pkgver"
 pkgdesc="The Qubes GUI Agent for AppVMs"
@@ -26,10 +29,12 @@ makedepends="
 	libxcomposite-dev
 	libxt
 	linux-pam-dev
+	lsb-release-minimal
 	make
 	patch
 	pixman
 	pkgconf
+	pipewire-dev
 	pulseaudio-dev
 	qubes-db-vm
 	qubes-db-vm-dev
@@ -95,10 +100,24 @@ pulseaudio() {
 	cd "$builddir"
 	make install-pulseaudio DESTDIR=$subpkgdir PA_VER=$pa_ver LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/lib
 }
+
+pipewire() {
+	pkgdesc="PipeWire support for Qubes VM.  This replaces the legacy PulseAudio module."
+	depends="pipewire"
+	provides="qubes-vm-pulseaudio=$pkgver-r$pkgrel"
+
+	cd "$builddir"
+	make install-pipewire \
+		"DESTDIR=$subpkgdir" \
+		LIBDIR=/usr/lib \
+		USRLIBDIR=/usr/lib \
+		SYSLIBDIR=/usr/lib
+}
+
 sha512sums="
-6a72fde5b3c1c6025b13b58340bb8d3eccab05050c8cbe3741d7c18ca48826e45a3df3716d77e2dd733c119ff8db5d920faa73f05cb94049306a0dad6f58349f  qubes-vm-gui-v4.1.31.tar.gz
+a6e1ed0ca640b25b27caa209c7027c44c9e745ac56cbde05b4b4c6f48bd5ae923e727f2debd3244fc1172c6430eaba5661316666b9cfa14fdc202124b37c4efe  qubes-vm-gui-v4.2.8.tar.gz
 f0bbb936e14689d0cbced2f564b8911f9287c0217616f02f3bd0c3060e516d080ad538219f089f5841c2b9d18bb4ad8efb63516ddfd46c18b038218378996a7d  0001-musl-build.patch
-262b93b4ea172926dc18b7af372168ff3f645a02db1529cb73af3d5aa6252a75500bfbd95344a835bbf646e753018d0e27885e41a03f06247226a485edb5e028  0001-initd-fix.patch
+01beace4c130200dc8d42248349ea858d2bec746aca2bdfa5948b6e7240bb3b832bbb8b324293fba6fd6aafb0a3d7a2e3928c7fd39d318ef4d5a18cfeb48cde6  0001-initd-fix.patch
 68d01e594296e18d54d8eaa17863451c3ac121e4fcacf98b64db14166bdcf38aa66f1c3659c5014c0a9cc25b5368df66f8c642b8e7af59da8d2a5ad97da9a194  qubes-gui-agent.openrc
 bd707f7956f58c2bb24ccb9adad1381c069e70820fcb1b01b09dc88570d9df00e0dc92a9ac3b242f828314568d5487257566a6fc61e75e62e010b7e4871f9ea0  qubes-sessions.sh
 b512d691f2a6b11fc329bf91dd05ca9c589bbd444308b27d3c87c75262dedf6afc68a9739229249a4bd3d0c43cb1f871eecbb93c4fe559e0f38bdabbffd06ad7  qubes-gui-agent.pam