diff --git a/0001-data-disable-wayland-on-certain-hardware.patch b/0001-data-disable-wayland-on-certain-hardware.patch
index e5c34b6..495fce8 100644
--- a/0001-data-disable-wayland-on-certain-hardware.patch
+++ b/0001-data-disable-wayland-on-certain-hardware.patch
@@ -1,4 +1,4 @@
-From 3e3ffe6083746b5ce7dadc482a14f18644dbf012 Mon Sep 17 00:00:00 2001
+From db206f3b4626dda65cf5517d2ae1ab633d791fef Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode@redhat.com>
 Date: Mon, 11 Feb 2019 18:14:07 -0500
 Subject: [PATCH] data: disable wayland on certain hardware
@@ -7,20 +7,34 @@ We're having issues with wayland on passthrough to virt
 setups and with the vendor nvidia driver on hybrid graphics
 setups, so disable it in those cases.
 ---
- data/61-gdm.rules.in | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
+ data/61-gdm.rules.in | 36 ++++++++++++++++++++++++++++++++----
+ 1 file changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
-index b1da191f8..fde22e9f3 100644
+index b1da191f8..d863a4a4d 100644
 --- a/data/61-gdm.rules.in
 +++ b/data/61-gdm.rules.in
-@@ -1,6 +1,20 @@
+@@ -1,6 +1,34 @@
  # disable Wayland on Hi1710 chipsets
 -ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
 -# disable Wayland when using the proprietary nvidia driver
 -DRIVER=="nvidia", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
 +ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
 +
++# disable Wayland on Matrox chipsets
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="@libexecdir@/gdm-disable-wayland"
++
++# disable Wayland on aspeed chipsets
++ATTR{vendor}=="0x1a03", ATTR{device}=="0x2010", RUN+="@libexecdir@/gdm-disable-wayland"
++ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", RUN+="@libexecdir@/gdm-disable-wayland"
++
 +# disable Wayland on hybrid systems with vendor nvidia driver
 +# default to Xorg on single gpu vendor nvidia systems
 +DRIVER=="nvidia", ENV{GDM_HAS_VENDOR_NVIDIA_DRIVER}="1"
diff --git a/gdm.spec b/gdm.spec
index 30bb81f..ca45d40 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -11,7 +11,7 @@
 Name: gdm
 Epoch: 1
 Version: 40.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -311,6 +311,10 @@ dconf update || :
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Thu Aug 19 2021 Ray Strode <rstrode@redhat.com> - 40.1-6
+- Disable wayland on server chips
+  Resolves: #1963919
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:40.1-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688