diff --git a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch b/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
deleted file mode 100644
index a75365a6324..00000000000
--- a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ff379fb93ae2539bf9fae70ccc8e0351e5665fb0 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 5 Oct 2020 12:13:07 +0200
-Subject: [PATCH] backend: Don't pull generated headers (indirectly)
-
-Use a typedef for MetaRemoteDesktop, so tests poking MetaBackend don't
-indirectly depend upon generated headers. This is arguably a code fix
-for a build system bug.
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470
-
-Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
-(or something...)
----
- src/backends/meta-backend-private.h | 4 ----
- src/backends/meta-backend-types.h   | 4 ++++
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/backends/meta-backend-private.h src/backends/meta-backend-private.h
-index 6d7d3ad758..5f4981fda5 100644
---- src/backends/meta-backend-private.h
-+++ src/backends/meta-backend-private.h
-@@ -42,10 +42,6 @@
- #include "backends/meta-settings-private.h"
- #include "core/util-private.h"
- 
--#ifdef HAVE_REMOTE_DESKTOP
--#include "backends/meta-remote-desktop.h"
--#endif
--
- #define DEFAULT_XKB_RULES_FILE "evdev"
- #define DEFAULT_XKB_MODEL "pc105+inet"
- 
-diff --git src/backends/meta-backend-types.h src/backends/meta-backend-types.h
-index 4753c07440..146a8c3d7c 100644
---- src/backends/meta-backend-types.h
-+++ src/backends/meta-backend-types.h
-@@ -59,4 +59,8 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
- 
- typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
- 
-+#ifdef HAVE_REMOTE_DESKTOP
-+typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
-+#endif
-+
- #endif /* META_BACKEND_TYPE_H */
--- 
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 80bfe109da6..70df3b8cf4b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,13 +1,14 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.1
+version=3.38.3
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
  -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland
  -Dxwayland_initfd=disabled"
-hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server"
+hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
+ xorg-server-xwayland"
 makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
  libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
@@ -18,22 +19,29 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
+checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
 shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
  libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
 
-case "$XBPS_MACHINE" in i686*)
-	pre_build() {
-		ninja ${makejobs} -C build src/meta-dbus-display-config.h
-	}
-;;
-esac
+# Upstream keeps pulling generated headers even though it can cause race
+# conditions in meson/ninja
+pre_build() {
+	ninja ${makejobs} -C build src/meta-dbus-display-config.h
+}
 
 # needs X
 do_check() {
 	:
 }
 
+post_install() {
+	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
+	# meant to be called with 'pkg-config --variable'
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+}
+
 mutter-devel_package() {
 	depends="gtk+3-devel graphene-devel clutter-devel
 	 libX11-devel libXtst-devel mutter-${version}_${revision}"