diff --git a/gdm-disable-wayland-on-mgag200-chipsets.patch b/gdm-disable-wayland-on-mgag200-chipsets.patch
new file mode 100644
index 0000000..897c4ea
--- /dev/null
+++ b/gdm-disable-wayland-on-mgag200-chipsets.patch
@@ -0,0 +1,20 @@
+Index: gdm-3.28.0/data/61-gdm.rules
+===================================================================
+--- gdm-3.28.0.orig/data/61-gdm.rules
++++ gdm-3.28.0/data/61-gdm.rules
+@@ -1,2 +1,14 @@
+-# disable Wayland on Cirrus chipsets
++# Disable Wayland on specific chipsets
++
++# Cirrus Logic
+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++
++# Matrox Electronics Systems Ltd. MGA G200 server engines
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'"
diff --git a/gdm.changes b/gdm.changes
index 86a3302..ef1ae05 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -4,6 +4,26 @@ Tue Mar 13 14:29:24 UTC 2018 - dimstar@opensuse.org
 - Update to version 3.28.0:
   + Updated translations.
 
+-------------------------------------------------------------------
+Mon Mar 12 04:46:37 UTC 2018 - yfjiang@suse.com
+
+- Add gdm-disable-wayland-on-mgag200-chipsets.patch: by falling 
+  back GNOME to X, the patch targets to provide a better user 
+  experiences for servers with mgag200 graphic chips, which suffer 
+  the sluggish keyboard/mouse issues running GNOME on wayland 
+  (bsc#1073550  bsc#1077802). Some of the servers could not
+  initiate GNOME in a similar context (bsc#1070933).
+
+  With the complexity of the problem, Wayland probably needs 
+  further track to get the specific hardware adapted. At the 
+  same time the issue itself is tracked in upstream 
+  (glgo#GNOME/mutter/issues/59), the better way for now to make 
+  SLE-15 working smoothly is to disable the chipset on Wayland 
+  (bsc#1083609, bgo#794106).
+
+  In addition, the patch updates the comments section in
+  data/61-gdm.rules to make the context easier to append.
+
 -------------------------------------------------------------------
 Wed Mar  7 16:44:02 UTC 2018 - dimstar@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 78b89d9..47093f1 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -27,7 +27,7 @@ Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-URL:            https://wiki.gnome.org/Projects/GDM
+Url:            https://wiki.gnome.org/Projects/GDM
 Source:         http://download.gnome.org/sources/gdm/3.28/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
@@ -42,6 +42,8 @@ Source7:        X11-displaymanager-gdm
 Source8:        autogen.sh
 # PATCH-FEATURE-OPENSUSE gdm-workaround-boo971852.patch zaitor@opensuse.org -- Work around boo971852 - xsessions is just not going to happen for a gdm user - Those users ALL have gnome-shell installed (which is mandatory for gdm to operate) - openSUSE only
 Patch0:         gdm-workaround-boo971852.patch
+# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bgo#794106 bsc#1083609 yfjiang@suse.com -- Disable Wayland on mgag200 chipsets
+Patch1:         gdm-disable-wayland-on-mgag200-chipsets.patch
 # WARNING: do not remove/significantly change patch3 without updating the relevant patch in accountsservice too
 # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 bsc#919723 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch)
 Patch3:         gdm-sysconfig-settings.patch
@@ -192,6 +194,7 @@ running display manager.
 %prep
 %setup -q
 cp %{SOURCE8} .
+%patch1 -p1
 %patch3 -p1
 %patch7 -p1
 %patch34 -p1