diff --git a/ibus.changes b/ibus.changes
index 29d189d..c1b7bb3 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -4,6 +4,12 @@ Thu Sep 24 07:01:32 UTC 2020 - Cliff Zhao <qzhao@suse.com>
 - Update ibus.spec: Drop the is_opensuse macro to eliminate the
   difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084).
 
+-------------------------------------------------------------------
+Sat Sep 19 17:35:46 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
+
+- Move xim.d files to /usr/etc when available, which is
+  currently Tumbleweed only (boo#1176431)
+
 -------------------------------------------------------------------
 Tue May 12 07:32:41 UTC 2020 - QK ZHU <qkzhu@suse.com>
 
diff --git a/ibus.spec b/ibus.spec
index c1eb009..40e91a2 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -18,6 +18,11 @@
 
 %define with_wayland 1
 %define with_emoji 1
+%if ! %{defined _distconfdir}
+%define _distconfdir %{_sysconfdir}
+%else
+%define use_usretc 1
+%endif
 
 Name:           ibus
 Version:        1.5.22
@@ -232,15 +237,15 @@ make %{?_smp_mflags}
 %make_install
 
 # autostart
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
-install -m 644 xim.d-ibus-121 %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
+mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/
+install -m 644 xim.d-ibus-121 %{buildroot}%{_distconfdir}/X11/xim.d/ibus
 mkdir -p %{buildroot}%{_bindir}
 install -c -m 0755 ibus-autostart %{buildroot}%{_bindir}/ibus-autostart
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
 install -c -m 0644 ibus-autostart.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
 
 PRIORITY=40
-pushd %{buildroot}%{_sysconfdir}/X11/xim.d/
+pushd %{buildroot}%{_distconfdir}/X11/xim.d/
     for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \
                 pa ru sk vi zh_TW zh_CN zh_HK zh_SG \
                 de fr it es nl cs pl da nn nb fi en sv
@@ -300,7 +305,11 @@ dconf update
 %doc AUTHORS README README.SUSE xim.ibus.suse.template
 %license COPYING
 %{_rpmmacrodir}/macros.ibus
+%if %{defined use_usretc}
+%{_distconfdir}/X11/xim.d/*
+%else
 %config %{_sysconfdir}/X11/xim.d/*
+%endif
 %{_bindir}/ibus
 %{_bindir}/ibus-autostart
 %{_bindir}/ibus-daemon