diff --git a/rpcbind.spec b/rpcbind.spec
index e7ce492..688bc90 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,10 @@
+# These are macros to be usable outside of the build section
+%global rpcbind_user_group rpc
+%global rpcbind_state_dir %{_rundir}/rpcbind
+
 Name:           rpcbind
 Version:        0.2.4
-Release:        7.rc2%{?dist}.2
+Release:        8.rc2%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -54,15 +58,13 @@ PIE="-fpie"
 %endif
 export PIE
 
-RPCBUSR=rpc
-RPCBDIR=/run/rpcbind
 CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
 
 autoreconf -fisv
 %configure CFLAGS="$CFLAGS" LDFLAGS="-pie" \
     --enable-warmstarts \
-    --with-statedir="$RPCBDIR" \
-    --with-rpcuser="$RPCBUSR" \
+    --with-statedir="%rpcbind_state_dir" \
+    --with-rpcuser="%rpcbind_user_group" \
     --with-nss-modules="files altfiles" \
     --enable-libwrap \
     --enable-debug
@@ -75,6 +77,7 @@ mkdir -p %{buildroot}{%{_sbindir},%{_bindir},/etc/sysconfig}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_tmpfilesdir}
 mkdir -p %{buildroot}%{_mandir}/man8
+mkdir -p %{buildroot}%{rpcbind_state_dir}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 install -m644 %{SOURCE1} %{buildroot}/etc/sysconfig/rpcbind
@@ -137,8 +140,13 @@ fi
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}.socket
 %{_tmpfilesdir}/%{name}.conf
+%attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
 
 %changelog
+* Wed Sep 06 2017 Nils Philippsen <nils@redhat.com> - 0.2.4-8.rc2
+- create and formally own the state directory so it is available from the time
+  of first installation until reboot
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-7.rc2.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild