diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 1ac6f64..61dd44e 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 30 12:35:53 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- move xorg.conf.d snippets from /etc/X11/xorg.conf.d to
+  /usr/share/X11/xorg.conf.d (boo#1139692)
+
 -------------------------------------------------------------------
 Thu May 30 20:42:40 UTC 2019 - Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0054c30..4ea7e83 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -476,12 +476,8 @@ install -m 644 %{S:6} %{buildroot}%{pci_ids_dir}
 %endif
 ln -snf Xorg %{buildroot}%{_bindir}/X
 %if 0%{?suse_version} > 1120
-# get rid of evdev config file, since it's meanwhile shipped with
-# evdev driver itself (since 2.10.0)
-rm -f %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-evdev.conf
 mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
-cp %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-quirks.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
-%{__install} -m 644 %{S:5} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
+%{__install} -m 644 %{S:5} %{buildroot}%{_datadir}/X11/xorg.conf.d
 %endif
 %if 0%{?suse_version} < 1315
 mkdir -p %{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
@@ -581,10 +577,8 @@ fi
 %dir %{pci_ids_dir}
 %{pci_ids_dir}/modesetting.ids
 %endif
-%config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf
-%config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf
 %dir %{_datadir}/X11/xorg.conf.d
-%{_datadir}/X11/xorg.conf.d/10-*.conf
+%{_datadir}/X11/xorg.conf.d/*.conf
 %endif
 %endif
 %{_tmpfilesdir}/xkb.conf