diff --git a/xdm-tarball.patch b/xdm-tarball.patch
index a1307f5..b0f0227 100644
--- a/xdm-tarball.patch
+++ b/xdm-tarball.patch
@@ -1,6 +1,6 @@
 diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
 --- ../old/etc/X11/xdm/RunChooser	2015-07-29 14:46:22.000000000 +0200
-+++ ./etc/X11/xdm/RunChooser	2020-09-05 00:40:17.437336000 +0200
++++ ./etc/X11/xdm/RunChooser	2020-09-05 05:19:59.967153000 +0200
 @@ -9,7 +9,7 @@
  #
   LIBDIR=/usr/lib/X11
@@ -10,9 +10,44 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
   BINDIR=/usr/bin
  
  no_exit_on_failed_exec=1
+@@ -85,7 +85,7 @@
+ #
+ pidof -s gdm > /dev/null 2>&1
+ if test $? -eq 0 ; then
+-    $xrdb -override -retain ${XDMDIR}/Xresources
++    $xrdb -override -retain /usr/etc/X11/Xresources
+ fi
+ 
+ #
+@@ -107,6 +107,8 @@
+ 	    cat $sysxkbmap | $xkbcomp - $DISPLAY
+ 	elif test -r $sysmodmap ; then
+ 	    $xmodmap $sysmodmap
++        elif test -r /usr/etc/X11/Xmodmap; then
++            $xmodmap /usr/etc/X11/Xmodmap
+ 	fi
+     else
+ 	# TCP/IP connection (remote or local)
+@@ -114,6 +116,8 @@
+ 	    cat $defxkbmap | $xkbcomp - $DISPLAY
+ 	elif test -r $defmodmap ; then
+ 	    $xmodmap $defmodmap
++        elif test -r /usr/etc/X11/Xmodmap.remote; then
++            $xmodmap /usr/etc/X11/Xmodmap.remote
+ 	fi
+ 	if test -s $hostxkbmap -a -x $xkbcomp ; then
+ 	    cat $hostxkbmap | $xkbcomp - $DISPLAY
+@@ -123,7 +127,6 @@
+     fi
+ fi
+ 
+-
+ #
+ # Handle background:
+ #   First users choise, if no choise is given
 diff -u -r ../old/etc/X11/xdm/SUSEconfig.xdm ./etc/X11/xdm/SUSEconfig.xdm
 --- ../old/etc/X11/xdm/SUSEconfig.xdm	2018-07-11 16:42:58.529260339 +0200
-+++ ./etc/X11/xdm/SUSEconfig.xdm	2020-09-04 23:59:30.125566000 +0200
++++ ./etc/X11/xdm/SUSEconfig.xdm	2020-09-05 04:59:05.050486000 +0200
 @@ -69,8 +69,8 @@
      echo "Using MD5DIR=\"$MD5DIR\"..."
  }
@@ -37,7 +72,7 @@ diff -u -r ../old/etc/X11/xdm/SUSEconfig.xdm ./etc/X11/xdm/SUSEconfig.xdm
  	sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig
 diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset
 --- ../old/etc/X11/xdm/Xreset	2014-12-15 19:34:46.000000000 +0100
-+++ ./etc/X11/xdm/Xreset	2020-09-04 23:49:39.498480000 +0200
++++ ./etc/X11/xdm/Xreset	2020-09-05 05:21:10.346350000 +0200
 @@ -9,7 +9,7 @@
  # Author: Werner Fink,   <werner@suse.de>
  #
@@ -49,16 +84,16 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset
  xmessage=${BINDIR}/xmessage
 diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession
 --- ../old/etc/X11/xdm/Xsession	2017-07-25 11:58:00.067080000 +0200
-+++ ./etc/X11/xdm/Xsession	2020-09-04 23:54:10.477826000 +0200
-@@ -34,7 +34,7 @@
++++ ./etc/X11/xdm/Xsession	2020-09-05 05:27:05.666149000 +0200
+@@ -33,7 +33,7 @@
+ #
  # Some system defaults
  #
-     XETCDIR=/etc/X11
--     XDMDIR=$XETCDIR/xdm
-+     XDMDIR=/usr/etc/X11/xdm
+-    XETCDIR=/etc/X11
++    XETCDIR=/usr/etc/X11
+      XDMDIR=$XETCDIR/xdm
     XINITDIR=$XETCDIR/xinit
  :  ${TMPDIR=/tmp}
- 
 @@ -187,7 +187,11 @@
  #
  # By default we set system defaults for the language
@@ -85,22 +120,18 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession
  fi
  
  #
-@@ -291,7 +299,11 @@
+@@ -291,7 +299,7 @@
  # Source common code shared between the
  # X session and X init scripts
  #
 -. /etc/X11/xinit/xinitrc.common
-+if [ -r /etc/X11/xinit/xinitrc.common ]; then
-+    . /etc/X11/xinit/xinitrc.common
-+elif [ -r /usr/etc/X11/xinit/xinitrc.common ]; then
-+    . /usr/etc/X11/xinit/xinitrc.common
-+fi
++. /usr/etc/X11/xinit/xinitrc.common
  
  # Restore arguments but skip window manager
  set -- "${argv[@]}"
 diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup
 --- ../old/etc/X11/xdm/Xsetup	2020-08-26 15:35:43.014615021 +0200
-+++ ./etc/X11/xdm/Xsetup	2020-09-04 23:56:20.188841000 +0200
++++ ./etc/X11/xdm/Xsetup	2020-09-05 05:31:57.346409000 +0200
 @@ -9,7 +9,7 @@
  #
   LIBDIR=/usr/lib/X11
@@ -110,9 +141,36 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup
   BINDIR=/usr/bin
  
  no_exit_on_failed_exec=1
+@@ -184,7 +184,7 @@
+ 	#endif
+ 	EOF
+ else
+-    $xrdb $cpp -override -retain ${ETCDIR}/Xresources
++    $xrdb $cpp -override -retain /usr/etc/X11/Xresources
+ fi
+ 
+ #
+@@ -206,6 +206,8 @@
+ 	    cat $sysxkbmap | $xkbcomp - $DISPLAY
+ 	elif test -r $sysmodmap ; then
+ 	    $xmodmap $sysmodmap
++        elif test -r /usr/etc/X11/Xmodmap ; then
++            $xmodmap /usr/etc/X11/Xmodmap
+ 	fi
+     else
+ 	# TCP/IP connection (remote or local)
+@@ -213,6 +215,8 @@
+ 	    cat $defxkbmap | $xkbcomp - $DISPLAY
+ 	elif test -r $defmodmap ; then
+ 	    $xmodmap $defmodmap
++        elif test -r /usr/etc/X11/Xmodmap.remote ; then
++            $xmodmap /usr/etc/X11/Xmodmap.remote
+ 	fi
+ 	if test -s $hostxkbmap -a -x $xkbcomp ; then
+ 	    cat $hostxkbmap | $xkbcomp - $DISPLAY
 diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup
 --- ../old/etc/X11/xdm/Xstartup	2020-08-26 15:35:26.270871116 +0200
-+++ ./etc/X11/xdm/Xstartup	2020-09-05 00:00:28.359409000 +0200
++++ ./etc/X11/xdm/Xstartup	2020-09-05 04:59:05.067474000 +0200
 @@ -9,7 +9,7 @@
  # Author: Werner Fink,   <werner@suse.de>
  #
@@ -124,7 +182,7 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup
  xmessage=${BINDIR}/xmessage
 diff -u -r ../old/etc/X11/xdm/keytable ./etc/X11/xdm/keytable
 --- ../old/etc/X11/xdm/keytable	2017-10-18 16:58:19.074036000 +0200
-+++ ./etc/X11/xdm/keytable	2020-09-04 23:58:22.567705000 +0200
++++ ./etc/X11/xdm/keytable	2020-09-05 04:59:05.073490000 +0200
 @@ -6,8 +6,8 @@
  fi
  
@@ -138,7 +196,7 @@ diff -u -r ../old/etc/X11/xdm/keytable ./etc/X11/xdm/keytable
  function setkeyboard {
 diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession
 --- ../old/etc/X11/xdm/sys.xsession	2016-06-03 15:25:42.000000000 +0200
-+++ ./etc/X11/xdm/sys.xsession	2020-09-04 23:55:09.331646000 +0200
++++ ./etc/X11/xdm/sys.xsession	2020-09-05 05:35:14.220273000 +0200
 @@ -38,7 +38,7 @@
  argv=("$@")
  set --
@@ -148,35 +206,27 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession
  do
      test -e $script || continue
      test -d $script && continue
-@@ -63,7 +63,11 @@
+@@ -63,7 +63,7 @@
  #
  # Use system default xinitrc if the users does not have one.
  #
 -XINITRCFILE=/etc/X11/xinit/xinitrc
-+if [ -r /etc/X11/xinit/xinitrc ]; then
-+    XINITRCFILE=/etc/X11/xinit/xinitrc
-+elif [ -r /usr/etc/X11/xinit/xinitrc ]; then
-+    XINITRCFILE=/usr/etc/X11/xinit/xinitrc
-+fi
++XINITRCFILE=/usr/etc/X11/xinit/xinitrc
  test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc"
  
  if test -f "$XINITRCFILE" ; then
-@@ -77,7 +81,11 @@
+@@ -77,7 +77,7 @@
      # Source common code shared between the
      # X session and X init scripts
      #
 -    . /etc/X11/xinit/xinitrc.common
-+    if [ -r /etc/X11/xinit/xinitrc ]; then
-+        . /etc/X11/xinit/xinitrc.common
-+    elif [ -r /usr/etc/X11/xinit/xinitrc ]; then
-+        . /usr/etc/X11/xinit/xinitrc.common
-+    fi
++    . /usr/etc/X11/xinit/xinitrc.common
      unset STARTUP WINDOW_MANAGER
  
      set -- ${1+"$@"} $WINDOWMANAGER
 diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config
 --- ../old/etc/X11/xdm/xdm-config	2020-08-26 15:36:22.290004407 +0200
-+++ ./etc/X11/xdm/xdm-config	2020-09-04 23:56:41.284679000 +0200
++++ ./etc/X11/xdm/xdm-config	2020-09-05 05:35:28.212994000 +0200
 @@ -4,10 +4,10 @@
  DisplayManager.errorLogFile:	/var/log/xdm.errors
  DisplayManager.pidFile:		/run/xdm.pid
@@ -217,7 +267,7 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config
  ! SECURITY: do not listen for XDMCP or Chooser requests
 diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager
 --- ../old/usr/lib/X11/display-manager	2020-09-04 13:11:23.054517000 +0200
-+++ ./usr/lib/X11/display-manager	2020-09-04 23:48:56.887780000 +0200
++++ ./usr/lib/X11/display-manager	2020-09-05 05:01:39.171143000 +0200
 @@ -16,8 +16,11 @@
  . /etc/sysconfig/displaymanager
  . /etc/sysconfig/language
@@ -232,16 +282,12 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager
  
  locale_vars="     \
  LANG              \
-@@ -67,14 +70,18 @@
+@@ -67,14 +70,14 @@
  unset DEFAULT_WM
  export WINDOWMANAGER
  
 -DMDIR=/etc/X11/xdm
-+if [ -d /usr/etc/X11/xdm ]; then
-+    DMDIR=/usr/etc/X11/xdm
-+else
-+    DMDIR=/etc/X11/xdm
-+fi
++DMDIR=/usr/etc/X11/xdm
  RELOADSIGNAL="-HUP"
  
  PIDFILELNK="/run/displaymanager.pid"
@@ -253,7 +299,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager
          # Do no try to start Xserver on platforms which may ship without
          # graphics card (bsc#1039497)
          if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then
-@@ -87,8 +94,8 @@
+@@ -87,8 +90,8 @@
              fi
          fi
          MD5DIR="/var/adm/SuSEconfig/md5" \
@@ -264,7 +310,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager
          /bin/logger
  	return 0
      fi
-@@ -159,8 +166,8 @@
+@@ -159,8 +162,8 @@
      start)
  
  	# use system keyboard as global X keyboard configuration
diff --git a/xdm.changes b/xdm.changes
index 12bd083..62e617c 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep  5 03:41:38 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- updated xdm-tarball.patch
+  * adjusted for changes in xmodmap and xinit (boo#1173049) 
+
 -------------------------------------------------------------------
 Fri Sep  4 22:33:30 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>