diff --git a/.gitignore b/.gitignore
index 3c72a61..a362ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xorg-server-1.20.10.tar.bz2
+SOURCES/xorg-server-1.20.11.tar.bz2
diff --git a/.xorg-x11-server.metadata b/.xorg-x11-server.metadata
index 672ec7b..46447be 100644
--- a/.xorg-x11-server.metadata
+++ b/.xorg-x11-server.metadata
@@ -1 +1 @@
-e698b30adb781dfe0e7bee0aa489ea9df404a5db SOURCES/xorg-server-1.20.10.tar.bz2
+86ae4add5719e6026a569f5559d51e8707171d5d SOURCES/xorg-server-1.20.11.tar.bz2
diff --git a/SPECS/xorg-x11-server.spec b/SPECS/xorg-x11-server.spec
index 66ad4aa..6d4ff02 100644
--- a/SPECS/xorg-x11-server.spec
+++ b/SPECS/xorg-x11-server.spec
@@ -45,8 +45,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.20.10
-Release:   1%{?gitdate:.%{gitdate}}%{?dist}
+Version:   1.20.11
+Release:   2%{?gitdate:.%{gitdate}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -128,10 +128,6 @@ BuildRequires: libXinerama-devel libXi-devel
 BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
 BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel
 
-BuildRequires: wayland-devel
-BuildRequires: wayland-protocols-devel
-BuildRequires: pkgconfig(wayland-eglstream-protocols)
-BuildRequires: pkgconfig(wayland-client) >= 1.3.0
 BuildRequires: pkgconfig(epoxy)
 BuildRequires: pkgconfig(xshmfence) >= 1.1
 BuildRequires: libXv-devel
@@ -280,16 +276,6 @@ X protocol, and therefore supports the newer X extensions like
 Render and Composite.
 
 
-%package Xwayland
-Summary: Wayland X Server
-Group: User Interface/X
-Requires: xorg-x11-server-common >= %{version}-%{release}
-Requires: libEGL
-
-%description Xwayland
-Xwayland is an X server for running X clients under Wayland.
-
-
 %package devel
 Summary: SDK for X server driver module development
 Group: User Interface/X
@@ -368,7 +354,6 @@ autoreconf -f -v --install || exit 1
 
 %configure %{xservers} \
 	--enable-dependency-tracking \
-        --enable-xwayland-eglstream \
 	--disable-static \
 	--with-pic \
 	%{?no_int10} --with-int10=x86emu \
@@ -384,7 +369,7 @@ autoreconf -f -v --install || exit 1
 	--enable-config-udev \
 	--disable-unit-tests \
 	--enable-dmx \
-	--enable-xwayland \
+	--disable-xwayland \
 	%{dri_flags} %{?bodhi_flags} \
 	${CONFIGURE}
         
@@ -535,9 +520,6 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %{_bindir}/Xephyr
 %{_mandir}/man1/Xephyr.1*
 
-%files Xwayland
-%{_bindir}/Xwayland
-
 %files devel
 %doc COPYING
 #{_docdir}/xorg-server
@@ -552,6 +534,14 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Wed Jun  9 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-2
+- Remove Xwayland from the xserver builds
+  Resolves: #1956838
+
+* Tue Jun  1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-1
+- xserver 1.20.11
+  Resolves: #1954260
+
 * Thu Dec 10 2020 Adam Jackson <ajax@redhat.com> - 1.20.10-1
 - xserver 1.20.10
   Resolves: #1891871