diff --git a/build-sys-make-multi-seat-x-optional.patch b/build-sys-make-multi-seat-x-optional.patch
new file mode 100644
index 00000000..c86042c6
--- /dev/null
+++ b/build-sys-make-multi-seat-x-optional.patch
@@ -0,0 +1,60 @@
+From bd441fa27a22b7c6e11d9330560e0622fb69f297 Mon Sep 17 00:00:00 2001
+From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Date: Thu, 28 Nov 2013 17:07:29 +0000
+Subject: build-sys: make multi-seat-x optional
+
+At some point it should become disabled by default.
+
+http://lists.freedesktop.org/archives/systemd-devel/2013-November/014869.html
+---
+diff --git a/Makefile.am b/Makefile.am
+index 90874df..3598edd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4141,6 +4141,8 @@ MULTI_USER_TARGET_WANTS += \
+ SYSTEM_UNIT_ALIASES += \
+ 	systemd-logind.service dbus-org.freedesktop.login1.service
+ 
++if ENABLE_MULTI_SEAT_X
++
+ systemd_multi_seat_x_SOURCES = \
+ 	src/login/multi-seat-x.c
+ 
+@@ -4151,6 +4153,8 @@ systemd_multi_seat_x_LDADD = \
+ rootlibexec_PROGRAMS += \
+ 	systemd-multi-seat-x
+ 
++endif
++
+ dist_udevrules_DATA += \
+ 	src/login/70-uaccess.rules \
+ 	src/login/70-power-switch.rules
+diff --git a/configure.ac b/configure.ac
+index f1b00c5..ab24266 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -794,6 +794,14 @@ fi
+ AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"])
+ 
+ # ------------------------------------------------------------------------------
++have_multi_seat_x=no
++AC_ARG_ENABLE(multi_seat_x, AS_HELP_STRING([--disable-multi-seat-x], [do not build multi-seat-x]))
++if test "x$enable_multi_seat_x" != "xno"; then
++        have_multi_seat_x=yes
++fi
++AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"])
++
++# ------------------------------------------------------------------------------
+ AC_ARG_WITH(rc-local-script-path-start,
+         AS_HELP_STRING([--with-rc-local-script-path-start=PATH],
+                 [Path to /etc/rc.local]),
+@@ -1077,6 +1085,7 @@ AC_MSG_RESULT([
+         nss-myhostname:          ${have_myhostname}
+         gudev:                   ${enable_gudev}
+         gintrospection:          ${enable_introspection}
++        multi-seat-x:            ${have_multi_seat_x}
+         Python:                  ${have_python}
+         Python Headers:          ${have_python_devel}
+         man pages:               ${have_manpages}
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/systemd.changes b/systemd.changes
index ba215dd6..4db1dc06 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Dec 16 11:08:33 UTC 2013 - lbsousajr@gmail.com
+
+- Add build-sys-make-multi-seat-x-optional.patch
+  * See: http://cgit.freedesktop.org/systemd/systemd/commit/?id=bd441fa27a22b7c6e11d9330560e0622fb69f297
+  * Now systemd-multi-seat-x build can be disabled with configure option
+    --disable-multi-seat-x. It should be done when xorg-x11-server
+    no longer needs it (work in progress).
+
 -------------------------------------------------------------------
 Mon Dec 16 09:43:29 UTC 2013 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index daa68f57..b34f9c2a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -267,6 +267,8 @@ Patch1012:      1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_use
 Patch1013:      U_logind_revert_lazy_session_activation_on_non_vt_seats.patch
 # PATCH-FIX-OPENSUSE 1014-journald-with-journaling-FS.patch
 Patch1014:      1014-journald-with-journaling-FS.patch
+# PATCH-FIX-UPSTREAM build-sys-make-multi-seat-x-optional.patch
+Patch1015:      build-sys-make-multi-seat-x-optional.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -547,6 +549,7 @@ cp %{SOURCE7} m4/
 %patch1012 -p1
 %patch1013 -p1
 %patch1014 -p1
+%patch1015 -p1
 
 # ensure generate files are removed
 rm -f units/emergency.service