diff --git a/avahi.spec b/avahi.spec
index 558e840..66c9e0b 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -16,7 +16,7 @@
 
 Name:             avahi
 Version:          0.6.31
-Release:          19%{?dist}
+Release:          20%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -375,18 +375,15 @@ rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-dnsconfd
 %find_lang %{name}
 
 %pre
-getent group avahi >/dev/null 2>&1 || groupadd \
-        -r \
-        -g 70 \
-        avahi >/dev/null 2>&1 || :
-getent passwd avahi >/dev/null 2>&1 || useradd \
-        -r -l \
-        -u 70 \
-        -g avahi \
-        -d %{_localstatedir}/run/avahi-daemon \
-        -s /sbin/nologin \
-        -c "Avahi mDNS/DNS-SD Stack" \
-        avahi >/dev/null 2>&1 || :
+getent group avahi >/dev/null || groupadd -f -g 70 -r avahi
+if ! getent passwd avahi > /dev/null ; then
+  if ! getent passwd 70 > /dev/null ; then
+    useradd -r -l -u 70 -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
+  else
+    useradd -r -l -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
+  fi
+fi
+exit 0
 
 %post
 /sbin/ldconfig >/dev/null 2>&1 || :
@@ -409,19 +406,15 @@ fi
 /usr/bin/systemctl try-restart avahi-daemon.service >/dev/null 2>&1 || :
 
 %pre autoipd
-getent group avahi-autoipd >/dev/null 2>&1 || groupadd \
-        -r \
-        -g 170 \
-        avahi-autoipd >/dev/null 2>&1 || :
-getent passwd avahi-autoipd >/dev/null 2>&1 || useradd \
-        -r -l \
-        -u 170 \
-        -g avahi-autoipd \
-        -d %{_localstatedir}/lib/avahi-autoipd \
-        -s /sbin/nologin \
-        -c "Avahi IPv4LL Stack" \
-        avahi-autoipd >/dev/null 2>&1 || :
-:;
+getent group avahi-autoipd >/dev/null || groupadd -f -g 170 -r avahi-autoipd
+if ! getent passwd avahi-autoipd > /dev/null ; then
+  if ! getent passwd 170 > /dev/null; then
+    useradd -r -u 170 -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
+  else
+    useradd -r -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
+  fi
+fi
+exit 0
 
 %post dnsconfd
 %systemd_post avahi-dnsconfd.service
@@ -625,6 +618,9 @@ getent passwd avahi-autoipd >/dev/null 2>&1 || useradd \
 %endif
 
 %changelog
+* Thu Sep 26 2013 Rex Dieter <rdieter@fedoraproject.org> 0.6.31-20
+- conform to http://fedoraproject.org/wiki/Packaging/UsersAndGroups#Soft_static_allocation
+
 * Wed Sep 25 2013 Kalev Lember <kalevlember@gmail.com> - 0.6.31-19
 - Make sure the split up -devel package require avahi-devel