diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index 243bf5f..baf08c5 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -650,7 +650,7 @@ getent passwd avahi-autoipd >/dev/null || \
 %post autoipd
 %{fillup_only -ns avahi autoipd}
 # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
-chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
+find %{_localstatedir}/lib/avahi-autoipd -user avahi |xargs chown avahi-autoipd:avahi-autoipd
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 %postun -n libavahi-client3 -p /sbin/ldconfig
diff --git a/avahi-mono.spec b/avahi-mono.spec
index 3219e2f..9a899d0 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -650,7 +650,7 @@ getent passwd avahi-autoipd >/dev/null || \
 %post autoipd
 %{fillup_only -ns avahi autoipd}
 # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
-chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
+find %{_localstatedir}/lib/avahi-autoipd -user avahi |xargs chown avahi-autoipd:avahi-autoipd
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 %postun -n libavahi-client3 -p /sbin/ldconfig
diff --git a/avahi.changes b/avahi.changes
index 935e083..93aec67 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 21 21:39:05 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- When changing ownership of /var/lib/autoipd, only change
+  ownership of files owned by avahi, to mitigate against
+  possible exploits (bsc#1154063).
+
 -------------------------------------------------------------------
 Wed Apr  8 11:51:58 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/avahi.spec b/avahi.spec
index 85f19fb..96cc998 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -645,7 +645,7 @@ getent passwd avahi-autoipd >/dev/null || \
 %post autoipd
 %{fillup_only -ns avahi autoipd}
 # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11.
-chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd
+find %{_localstatedir}/lib/avahi-autoipd -user avahi |xargs chown avahi-autoipd:avahi-autoipd
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 %postun -n libavahi-client3 -p /sbin/ldconfig