diff --git a/xmodmap.changes b/xmodmap.changes
index 43a5417..86162c8 100644
--- a/xmodmap.changes
+++ b/xmodmap.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Sep  9 15:57:08 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- reenabled move to /usr/etc/X11 for Tumbleweed (boo#1173053)
+
+-------------------------------------------------------------------
+Tue Sep  8 09:51:56 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- reverted move to /usr/etc/X11 for now (boo#1173053, comment#3)
+
+-------------------------------------------------------------------
+Sat Sep  5 01:22:15 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- moved Xmodmap files to /usr/etc/X11 (boo#1173053)
+
 -------------------------------------------------------------------
 Thu Feb 21 11:14:12 UTC 2019 - sndirsch@suse.com
 
diff --git a/xmodmap.spec b/xmodmap.spec
index 3717c13..da39fc4 100644
--- a/xmodmap.spec
+++ b/xmodmap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmodmap
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%if 0%{?suse_version} >= 1550
+%define UsrEtcMove 1
+%endif
+
 Name:           xmodmap
 Version:        1.0.10
 Release:        0
 Summary:        Utility to modify keymaps and pointer button mappings in X
 License:        MIT
 Group:          System/X11/Utilities
-Url:            http://xorg.freedesktop.org/
+URL:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 Source1:        Xmodmap.template
 Source2:        Xmodmap.remote.template
@@ -50,14 +54,25 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+%if 0%{?UsrEtcMove}
+install -m0644 -D %{SOURCE1} %{buildroot}%{_distconfdir}/X11/Xmodmap
+install -m0644 -D %{SOURCE2} %{buildroot}%{_distconfdir}/X11/Xmodmap.remote
+%else
 install -m0644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/Xmodmap
 install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote
+%endif
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README.md
+%if 0%{?UsrEtcMove}
+%dir %{_distconfdir}/X11
+%{_distconfdir}/X11/Xmodmap
+%{_distconfdir}/X11/Xmodmap.remote
+%else
 %config %{_sysconfdir}/X11/Xmodmap
 %config %{_sysconfdir}/X11/Xmodmap.remote
+%endif
 %{_bindir}/xmodmap
 %{_mandir}/man1/xmodmap.1%{?ext_man}