diff --git a/.gitignore b/.gitignore
index 4615d37..10e06c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xserver-5429791.tar.gz
+/xwayland-21.0.99.901.tar.xz
diff --git a/sources b/sources
index cbe1ac2..ff9655a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xserver-5429791.tar.gz) = e38c53465a4f75989beb8a695c70d0ff4fd24ef99e11652eb5b8b1a22788ba0ea784d2d0c352f21c2ad6c637b3b55f3321ccae94060a346caca56a031d38e3a0
+SHA512 (xwayland-21.0.99.901.tar.xz) = 960283d977567269d40fb5349b32f072f3fc539c2fea142b8b7246823e918261fb4c1625adc584f29e04eda3eca4fdaec5bd637bedea829978fcf663754eef52
diff --git a/xorg-x11-server-Xwayland.spec b/xorg-x11-server-Xwayland.spec
index 1a90a39..70bc55a 100644
--- a/xorg-x11-server-Xwayland.spec
+++ b/xorg-x11-server-Xwayland.spec
@@ -1,18 +1,22 @@
-%global commit 5429791b1cf7f6cabf6c64aad0a4b1b5418253c9
+%global commit 280aac5a0ee09c45b17ec4be0681397f7c34c12e
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-%global gitdate 20210201
-%global pkgname xserver
+#global gitdate 20210201
+%global pkgname %{?gitdate:xserver}%{!?gitdate:xwayland}
 
 %global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
 
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
-Version:   1.20.99.1
-Release:   0.1.%{gitdate}git%{shortcommit}%{?dist}
+Version:   21.0.99.901
+Release:   1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
 URL:       http://www.x.org
+%if 0%{?gitdate}
 Source0:   https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{pkgname}-%{shortcommit}.tar.gz
+%else
+Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
+%endif
 License:   MIT
 
 Requires: xorg-x11-server-common
@@ -86,13 +90,11 @@ The development package provides the developmental files which are
 necessary for developing Wayland compositors using Xwayland.
 
 %prep
-%autosetup -S git_am %{?gitdate:-n %{pkgname}-%{commit}}
+%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}}
 
 %build
 %meson \
-        -Dxwayland=true \
         -Dxwayland_eglstream=true \
-        -D{xorg,xnest,xvfb}=false \
         -Ddefault_font_path=%{default_font_path} \
         -Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
         -Dxkb_output_dir=%{_localstatedir}/lib/xkb \
@@ -122,5 +124,8 @@ rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Thu Feb 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.901-1
+- xwayland 21.0.99.901
+
 * Mon Feb  1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.99.1-0.1.20210201git5429791
 - Initial import (#1912335).