diff --git a/U_xserver_enable_grabdevice_by_default_for_non_seat0.patch b/U_xserver_enable_grabdevice_by_default_for_non_seat0.patch
new file mode 100644
index 0000000..588f86b
--- /dev/null
+++ b/U_xserver_enable_grabdevice_by_default_for_non_seat0.patch
@@ -0,0 +1,38 @@
+From c73c36b537f996574628e69681833ea37dec2b6e Mon Sep 17 00:00:00 2001
+From: Laércio de Sousa <lbsousajr@gmail.com>
+Date: Wed, 18 Sep 2013 16:42:17 +0000
+Subject: xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478)
+
+This patch contributes to fill the remaining gaps which make
+systemd-multi-seat-x wrapper still necessary in some multiseat setups.
+
+This also replaces previous evdev patch that does the same thing
+for that particular driver.
+
+When option "-seat" is passed with an argument different from "seat0",
+option "GrabDevice" for input devices is enabled by default
+(no need of enabling it in xorg.conf's "InputClass" section).
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478
+
+Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/config/udev.c b/config/udev.c
+index de89241..b55b78e 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -226,6 +226,10 @@ device_added(struct udev_device *udev_device)
+ 
+     input_options = input_option_new(input_options, "config_info", config_info);
+ 
++    /* Default setting needed for non-seat0 seats */
++    if (ServerIsNotSeat0())
++        input_options = input_option_new(input_options, "GrabDevice", "on");
++
+     LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n",
+                name, path);
+     rc = NewInputDeviceRequest(input_options, &attrs, &dev);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 7d4271f..ed1897a 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov 28 11:56:07 UTC 2013 - lbsousajr@gmail.com
+
+- Fix naming convention for last patch
+
+-------------------------------------------------------------------
+Thu Nov 28 10:15:16 UTC 2013 - lbsousajr@gmail.com
+
+- Add U_xserver_enable_grabdevice_by_default_for_non_seat0.patch
+  * See http://cgit.freedesktop.org/xorg/xserver/commit/?id=c73c36b537f996574628e69681833ea37dec2b6e
+
 -------------------------------------------------------------------
 Wed Nov  6 16:12:38 UTC 2013 - schwab@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 4547962..f76c560 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -166,6 +166,7 @@ Patch245:       u_randr_send_rrresourcechangenotify_event.patch
 Patch246:       u_randr_deliver_output_and_crtc_events_of_attached_output.patch
 Patch247:       u_randr_allow_rrselectinput_for_providerchange_and_resourcechange_events.patch
 Patch248:       N_randr_fix_abi.patch
+Patch249:       U_xserver_enable_grabdevice_by_default_for_non_seat0.patch
 
 %description
 This package contains the X.Org Server.
@@ -260,6 +261,7 @@ cp %{SOURCE96} .
 %patch246 -p1
 %patch247 -p1
 %patch248 -p1
+%patch249 -p1
 
 %build
 autoreconf -fi