diff --git a/.gitignore b/.gitignore
index 9f37d80..1ae0822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /xwayland-21.1.2.901.tar.xz
 /xwayland-21.1.3.tar.xz
 /xwayland-21.1.4.tar.xz
+/xwayland-22.0.99.901.tar.xz
diff --git a/0001-meson-Werror-no-array-bounds.patch b/0001-meson-Werror-no-array-bounds.patch
new file mode 100644
index 0000000..48ab8c4
--- /dev/null
+++ b/0001-meson-Werror-no-array-bounds.patch
@@ -0,0 +1,28 @@
+From ffbba91546bb1493a4701cc591cdd7343025a508 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri, 21 Jan 2022 11:31:53 +0100
+Subject: [PATCH xserver] meson: -Werror=no-array-bounds
+
+gcc 12 would raise a false positive here.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d4cad9d48..ee3d225da 100644
+--- a/meson.build
++++ b/meson.build
+@@ -41,7 +41,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+         '-Werror=sequence-point',
+         '-Werror=return-type',
+         '-Werror=trigraphs',
+-        '-Werror=array-bounds',
++        '-Werror=no-array-bounds',
+         '-Werror=write-strings',
+         '-Werror=address',
+         '-Werror=int-to-pointer-cast',
+-- 
+2.34.1
+
diff --git a/sources b/sources
index ce15939..fd25619 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xwayland-21.1.4.tar.xz) = 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
+SHA512 (xwayland-22.0.99.901.tar.xz) = ac1c947b7212bcc0b86433bbf30478173ff8499dab0175fea4a9fb2892706c96631243da7f2f82cf812d2df6efb5cd3534d394f958ba3c47aa2014b2a8120159
diff --git a/xorg-x11-server-Xwayland.spec b/xorg-x11-server-Xwayland.spec
index 2b6a8d8..1440786 100644
--- a/xorg-x11-server-Xwayland.spec
+++ b/xorg-x11-server-Xwayland.spec
@@ -8,8 +8,8 @@
 
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
-Version:   21.1.4
-Release:   2%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
+Version:   22.0.99.901
+Release:   1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
 URL:       http://www.x.org
 %if 0%{?gitdate}
@@ -18,6 +18,10 @@ Source0:   https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{
 Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
 %endif
 
+# FIXME!
+# Work around gcc 12: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103292
+Patch1: 0001-meson-Werror-no-array-bounds.patch
+
 License:   MIT
 
 Requires: xorg-x11-server-common
@@ -33,7 +37,6 @@ BuildRequires: pkgconfig(wayland-client) >= 1.3.0
 BuildRequires: pkgconfig(wayland-protocols)
 BuildRequires: pkgconfig(wayland-eglstream-protocols)
 
-BuildRequires: pkgconfig(dmx)
 BuildRequires: pkgconfig(epoxy) >= 1.5.5
 BuildRequires: pkgconfig(fontenc)
 BuildRequires: pkgconfig(libdrm) >= 2.4.0
@@ -58,6 +61,7 @@ BuildRequires: pkgconfig(xshmfence) >= 1.1
 BuildRequires: pkgconfig(xtrans) >= 1.3.2
 BuildRequires: pkgconfig(xtst)
 BuildRequires: pkgconfig(xv)
+BuildRequires: pkgconfig(libxcvt)
 BuildRequires: xorg-x11-proto-devel >= 7.7-10
 
 BuildRequires: mesa-libGL-devel >= 9.2
@@ -124,6 +128,9 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Tue Jan 25 2022 Olivier Fourdan <ofourdan@redhat.com> - 22.0.99.901
+- xwayland 22.0.99.901 (xwayland 22.1.0 rc1) - (#2042521)
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild