diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index b95e898..e9f2626 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.
-find %{_localstatedir}/lib/avahi-autoipd -user avahi |xargs -r0 chown avahi-autoipd:avahi-autoipd
+find %{_localstatedir}/lib/avahi-autoipd -user avahi -print0 |xargs -r0 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 7e34884..7ccfb6d 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.
-find %{_localstatedir}/lib/avahi-autoipd -user avahi |xargs -r0 chown avahi-autoipd:avahi-autoipd
+find %{_localstatedir}/lib/avahi-autoipd -user avahi -print0 |xargs -r0 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 5f604e2..0b98e03 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 31 16:22:16 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- Pass -print0 to find, to match -r0 being passed to xargs.
+
 -------------------------------------------------------------------
 Thu Jul 30 10:06:28 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/avahi.spec b/avahi.spec
index fb0dd62..0e4c5e7 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.
-find %{_localstatedir}/lib/avahi-autoipd -user avahi |xargs -r0 chown avahi-autoipd:avahi-autoipd
+find %{_localstatedir}/lib/avahi-autoipd -user avahi -print0 |xargs -r0 chown avahi-autoipd:avahi-autoipd
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 %postun -n libavahi-client3 -p /sbin/ldconfig