diff --git a/xdm-with-update-alternative.patch b/xdm-with-update-alternative.patch
index 6180265..0781dcb 100644
--- a/xdm-with-update-alternative.patch
+++ b/xdm-with-update-alternative.patch
@@ -1,7 +1,23 @@
-diff -ur xdm.old/usr/lib/X11/display-manager xdm.new/usr/lib/X11/display-manager
---- xdm.old/usr/lib/X11/display-manager	2017-02-06 14:19:33.541035000 +0100
-+++ xdm.new/usr/lib/X11/display-manager	2017-10-12 15:44:06.592204792 +0200
-@@ -109,6 +109,8 @@
+---
+ etc/X11/xdm/Xservers                              |    3 ++-
+ usr/lib/X11/display-manager                       |    7 +++++--
+ var/adm/fillup-templates/sysconfig.displaymanager |    8 --------
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+
+--- xdm.old/etc/X11/xdm/Xservers	2018-04-05 14:48:56.669172739 +0200
++++ xdm.new/etc/X11/xdm/Xservers	2018-04-05 14:45:33.129981406 +0200
+@@ -13,6 +13,7 @@
+ # use such a line to enable the console login option in the kdm menu
+ #:0 local@tty1 /usr/bin/X vt7
+ # "reserve" means that the X server gets only started on request (only kdm)
++# -keeptty implies that controlling tty is not detached (breaks startx!)
+ 
+-:0 local /usr/bin/X -nolisten tcp -br vt7
++:0 local /usr/bin/X -nolisten tcp -br vt7 -keeptty
+ 
+--- xdm.old/usr/lib/X11/display-manager
++++ xdm.new/usr/lib/X11/display-manager	2018-04-05 12:44:11.247521173 +0000
+@@ -121,6 +121,8 @@ plymouth_quit()
  
  #set -x
  
@@ -10,17 +26,20 @@ diff -ur xdm.old/usr/lib/X11/display-manager xdm.new/usr/lib/X11/display-manager
  DM=${DISPLAYMANAGER##*/}
  
  case "$DM" in
-@@ -127,6 +129,7 @@
+@@ -138,8 +140,9 @@ case "$DM" in
+ 	for i in $DISPLAY_MANAGERS
  	do
  	    name="${i}_vars"
- 	    PIDFILE=/var/run/$i.pid;
-+	    type $name > /dev/null || continue;
- 	    $name $DM && break;
+-	    PIDFILE=/var/run/$i.pid;
+-	    $name $DM && break;
++	    type -t $name &> /dev/null || continue
++	    PIDFILE=/var/run/$i.pid
++	    $name $DM && break
  	done
  	if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
-diff -ur xdm.old/var/adm/fillup-templates/sysconfig.displaymanager xdm.new/var/adm/fillup-templates/sysconfig.displaymanager
---- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager	2017-01-04 11:15:56.259500000 +0100
-+++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager	2017-10-12 16:35:23.775259305 +0200
+ 	then
+--- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager
++++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager	2017-10-12 14:35:23.775259305 +0000
 @@ -1,14 +1,6 @@
  ## Path:	Desktop/Display manager
  ## Description:	settings to generate a proper displaymanager config
diff --git a/xdm.changes b/xdm.changes
index 0aeb3d1..4eec3fc 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr  5 12:30:01 UTC 2018 - werner@suse.de
+
+- systemd-logind integration requires to use -keeptty with X server
+  to hold the controlling tty (and breaks startx!).
+- Do not generate an error on not existing shell functions *_vars
+  in /usr/lib/X11/display-manager
+
 -------------------------------------------------------------------
 Fri Mar 16 16:44:52 UTC 2018 - sndirsch@suse.com