diff --git a/display-manager.service b/display-manager.service
index eafaaf8..cc6db40 100644
--- a/display-manager.service
+++ b/display-manager.service
@@ -11,6 +11,8 @@ PIDFile=/var/run/displaymanager.pid
 ExecStart=/usr/lib/X11/display-manager start
 ExecStop=/usr/lib/X11/display-manager stop
 ExecReload=/usr/lib/X11/display-manager reload
+KillMode=process
 
 [Install]
 WantedBy=graphical.target
+Also=xdm.service
diff --git a/xdm.changes b/xdm.changes
index 2e8dee0..43a3595 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 28 16:00:23 UTC 2014 - fcrozat@suse.com
+
+- Use KillMode=process for systemd service, this ensures Xorg won't
+  receive SIGKILL while switching to runlevel 3 [bnc#871808].
+- Add "Also=xdm.service" to display-manager.service to better
+  handle migration.
+
 -------------------------------------------------------------------
 Fri May 23 13:01:21 UTC 2014 - jsegitz@novell.com