diff --git a/debian.tar.gz b/debian.tar.gz
index f130a2f..f0011d3 100644
--- a/debian.tar.gz
+++ b/debian.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86195d97fdd6eb4b52a87f982dc39693d9c4c01d85691cae1a94c878837e2c22
-size 3442
+oid sha256:4546bd322cca641fb7934ccb4223f15cbc27ef779be6f23b7e69b000017168c4
+size 3447
diff --git a/snapper-0.9.0.tar.bz2 b/snapper-0.9.0.tar.bz2
deleted file mode 100644
index ea0f670..0000000
--- a/snapper-0.9.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b825ff120c4695bc2f3b280953b71f3d559a50720c7c41d619d1c0ed2238c7f
-size 638277
diff --git a/snapper-0.9.1.tar.bz2 b/snapper-0.9.1.tar.bz2
new file mode 100644
index 0000000..eab5d2e
--- /dev/null
+++ b/snapper-0.9.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a01616c50b6df19e09c02916359e8eb6ca7b2c890cdff156809e78dd57083099
+size 639741
diff --git a/snapper-Debian_10.0.dsc b/snapper-Debian_10.0.dsc
index 5c76fab..65984c0 100644
--- a/snapper-Debian_10.0.dsc
+++ b/snapper-Debian_10.0.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-Debian_9.0.dsc b/snapper-Debian_9.0.dsc
index 5c76fab..65984c0 100644
--- a/snapper-Debian_9.0.dsc
+++ b/snapper-Debian_9.0.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-Debian_Unstable.dsc b/snapper-Debian_Unstable.dsc
index 5c76fab..65984c0 100644
--- a/snapper-Debian_Unstable.dsc
+++ b/snapper-Debian_Unstable.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-Raspbian_10.dsc b/snapper-Raspbian_10.dsc
index aa71a78..d75a4b3 100644
--- a/snapper-Raspbian_10.dsc
+++ b/snapper-Raspbian_10.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
diff --git a/snapper-xUbuntu_17.04.dsc b/snapper-xUbuntu_17.04.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_17.04.dsc
+++ b/snapper-xUbuntu_17.04.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_17.10.dsc b/snapper-xUbuntu_17.10.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_17.10.dsc
+++ b/snapper-xUbuntu_17.10.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_18.04.dsc b/snapper-xUbuntu_18.04.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_18.04.dsc
+++ b/snapper-xUbuntu_18.04.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_18.10.dsc b/snapper-xUbuntu_18.10.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_18.10.dsc
+++ b/snapper-xUbuntu_18.10.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_19.04.dsc b/snapper-xUbuntu_19.04.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_19.04.dsc
+++ b/snapper-xUbuntu_19.04.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_19.10.dsc b/snapper-xUbuntu_19.10.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_19.10.dsc
+++ b/snapper-xUbuntu_19.10.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_20.04.dsc b/snapper-xUbuntu_20.04.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_20.04.dsc
+++ b/snapper-xUbuntu_20.04.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_20.10.dsc b/snapper-xUbuntu_20.10.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_20.10.dsc
+++ b/snapper-xUbuntu_20.10.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper-xUbuntu_21.04.dsc b/snapper-xUbuntu_21.04.dsc
index 6b1bfe3..56a4b01 100644
--- a/snapper-xUbuntu_21.04.dsc
+++ b/snapper-xUbuntu_21.04.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: snapper
-Version: 0.9.0-1
+Version: 0.9.1-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
@@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-162c62d0bb3a401273b85799168b49cd 638277 snapper-0.9.0.tar.bz2
+6546021355a93663cd9281fdd0f1cf0d 639741 snapper-0.9.1.tar.bz2
diff --git a/snapper.changes b/snapper.changes
index b16d211..90bd725 100644
--- a/snapper.changes
+++ b/snapper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 21 13:30:29 CEST 2021 - aschnell@suse.com
+
+- look for most configuration files in /etc/snapper and
+  /usr/share/snapper (bsc#1189601)
+- version 0.9.1
+
 -------------------------------------------------------------------
 Wed Jun 16 11:50:49 CEST 2021 - aschnell@suse.com
 
diff --git a/snapper.spec b/snapper.spec
index 82f523f..c62ef39 100644
--- a/snapper.spec
+++ b/snapper.spec
@@ -32,7 +32,7 @@
 %bcond_with coverage
 
 Name:           snapper
-Version:        0.9.0
+Version:        0.9.1
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         snapper-%{version}.tar.bz2
@@ -226,10 +226,11 @@ This package contains libsnapper, a library for filesystem snapshot management.
 %{_libdir}/libsnapper.so.*
 %dir %{_sysconfdir}/snapper
 %dir %{_sysconfdir}/snapper/configs
-%dir %{_sysconfdir}/snapper/config-templates
-%config(noreplace) %{_sysconfdir}/snapper/config-templates/default
-%dir %{_sysconfdir}/snapper/filters
-%config(noreplace) %{_sysconfdir}/snapper/filters/*.txt
+%dir /usr/share/snapper
+%dir /usr/share/snapper/config-templates
+%config /usr/share/snapper/config-templates/default
+%dir /usr/share/snapper/filters
+%config /usr/share/snapper/filters/*.txt
 %doc %dir %{_defaultdocdir}/snapper
 %doc %{_defaultdocdir}/snapper/AUTHORS
 %doc %{_defaultdocdir}/snapper/COPYING
@@ -239,6 +240,18 @@ This package contains libsnapper, a library for filesystem snapshot management.
 %config(noreplace) %{_sysconfdir}/sysconfig/snapper
 %endif
 
+%pre -n libsnapper5
+# Migration from /etc/snapper to /usr/share/snapper
+for i in config-templates/default filters/base.txt filters/lvm.txt filters/x11.txt ; do
+    test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i}.rpmsave.old ||:
+done
+
+%posttrans -n libsnapper5
+# Migration from /etc/snapper to /usr/share/snapper
+for i in config-templates/default filters/base.txt filters/lvm.txt filters/x11.txt ; do
+    test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i} ||:
+done
+
 %post -n libsnapper5
 /sbin/ldconfig
 %if 0%{?suse_version}
@@ -288,7 +301,7 @@ snapper during commits.
 
 %files -n snapper-zypp-plugin
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/snapper/zypp-plugin.conf
+%config /usr/share/snapper/zypp-plugin.conf
 %if 0%{?suse_version} < 1210
 %dir /usr/lib/zypp
 %dir /usr/lib/zypp/plugins
@@ -298,6 +311,18 @@ snapper during commits.
 %doc %{_mandir}/*/snapper-zypp-plugin.8*
 %doc %{_mandir}/*/snapper-zypp-plugin.conf.5*
 
+%pre -n snapper-zypp-plugin
+# Migration from /etc/snapper to /usr/share/snapper
+for i in zypp-plugin.conf ; do
+    test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i}.rpmsave.old ||:
+done
+
+%posttrans -n snapper-zypp-plugin
+# Migration from /etc/snapper to /usr/share/snapper
+for i in zypp-plugin.conf ; do
+    test -f /etc/snapper/${i}.rpmsave && mv -v /etc/snapper/${i}.rpmsave /etc/snapper/${i} ||:
+done
+
 %package -n pam_snapper
 Requires:       pam
 Requires:       snapper = %version