diff --git a/builder/build.sh b/builder/build.sh
index e9813f1..75794db 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -37,6 +37,10 @@ tar -C unix/xserver -xvf /tmp/xorg-server-${XORG_VER}.tar.bz2 --strip-components
 
 cd unix/xserver
 patch -Np1 -i ../xserver${XORG_PATCH}.patch
+if [[ $XORG_VER =~ ^1\.20\..*$ ]]; then
+  patch -Np1 -i ../xserver120.7.patch
+fi
+
 autoreconf -i
 # Configuring Xorg is long and has many distro-specific paths.
 # The distro paths start after prefix and end with the font path,
diff --git a/builder/dockerfile.ubuntu_bionic.build b/builder/dockerfile.ubuntu_bionic.build
index a21a716..cee01e1 100644
--- a/builder/dockerfile.ubuntu_bionic.build
+++ b/builder/dockerfile.ubuntu_bionic.build
@@ -2,6 +2,7 @@ FROM ubuntu:18.04
 
 ENV KASMVNC_BUILD_OS ubuntu
 ENV KASMVNC_BUILD_OS_CODENAME bionic
+ENV XORG_VER 1.20.10
 
 RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list