diff --git a/xdm.changes b/xdm.changes
index cb4dfe6..987bc40 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  4 20:20:05 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- move /etc/X11/xdm --> /usr/etc/X11/xdm and
+  /etc/pam.d -> /usr/etc/pam.d; still TODO: adjust scripts in 
+  xdm.tar.bz2 (boo#1173049)
+
 -------------------------------------------------------------------
 Fri Sep  4 11:17:34 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xdm.spec b/xdm.spec
index e23d0a8..d33b335 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -93,8 +93,6 @@ cp %{SOURCE2} .
 pushd xdm
 %patch1 -p1
 popd
-# Special note: patch 2 is applied in install section; tagging it here for the source validator only
-#patch2 -p1
 # reverse apply (boo#1130321)
 %patch3 -p1 -R
 
@@ -104,19 +102,35 @@ autoreconf -fi
 %configure \
         --disable-static \
         --with-pam \
+%if 0%{?suse_version} >= 1550
+        --with-xdmconfigdir=%{_distconfdir}/X11/xdm \
+        --with-xdmscriptdir=%{_distconfdir}/X11/xdm \
+%else
         --with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
         --with-xdmscriptdir=%{_sysconfdir}/X11/xdm \
+%endif
 	--with-systemdsystemunitdir=no
 make %{?_smp_mflags}
 
 %install
 %make_install
 # Not used anymore by SuSE
+%if 0%{?suse_version} >= 1550
+rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
+%else
 rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
+%endif
 
 pushd %{buildroot}
 # SuSE default XDM configuration
 tar xf %{SOURCE1}
+%if 0%{?suse_version} >= 1550
+mkdir -p usr/etc/X11/xdm
+mv etc/X11/xdm/* usr/etc/X11/xdm
+mv etc/pam.d usr/etc/
+rmdir etc/X11/xdm
+rmdir etc/X11
+%endif
 %if "%{_fillupdir}" != "/var/adm/fillup-templates"
   mkdir -p %{buildroot}$(dirname %{_fillupdir})
   mv %{buildroot}/var/adm/fillup-templates \
@@ -131,7 +145,11 @@ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\
 popd
 
 # Correct location (FHS-2.1)
+%if 0%{?suse_version} >= 1550
+ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_distconfdir}/X11/xdm/authdir
+%else
 ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_sysconfdir}/X11/xdm/authdir
+%endif
 # bnc#223734
 rm %{buildroot}%{_libdir}/X11/xdm/libXdmGreet.la
 # for FHS compliance (bnc#21857)
@@ -188,17 +206,30 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
 %{_dminitdir}/console
 /usr/lib/X11/displaymanagers/default-displaymanager
 %ghost %{_sysconfdir}/alternatives/default-displaymanager
+%if 0%{?suse_version} >= 1550
+%dir %{_distconfdir}/X11
+%{_distconfdir}/X11/xdm/
+%else
 %config %{_sysconfdir}/X11/xdm/
+%endif
+%if 0%{?suse_version} >= 1550
+%dir %{_distconfdir}/X11/xdm/scripts
+%else
 %dir %{_sysconfdir}/X11/xdm/scripts
+%endif
 %dir /usr/lib/firewalld
 %dir /usr/lib/firewalld/services
 /usr/lib/firewalld/services/x11.xml
-%exclude %{_sysconfdir}/init.d/xdm
 %{_unitdir}/display-manager.service
 /usr/lib/X11/display-manager
 %config %{_sysconfdir}/logrotate.d/xdm
+%if 0%{?suse_version} >= 1550
+%{_distconfdir}/pam.d/xdm
+%{_distconfdir}/pam.d/xdm-np
+%else
 %config(noreplace) %{_sysconfdir}/pam.d/xdm
 %config(noreplace) %{_sysconfdir}/pam.d/xdm-np
+%endif
 %dir %{_localstatedir}/lib/xdm/
 %{_fillupdir}/sysconfig.displaymanager
 %{_localstatedir}/lib/xdm/authdir/
diff --git a/xdm.tar.bz2 b/xdm.tar.bz2
index 4cedcbb..b6334fb 100644
--- a/xdm.tar.bz2
+++ b/xdm.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ae3032f832a90eae20a93fbde856450e702ab3f0b23f5c4abe70011bcc74de5
-size 23946
+oid sha256:935637652aab80fee6961973845c7c4d2c58fa677c23a5fc8b8967fffc1f4659
+size 22638