diff --git a/rpcbind.service b/rpcbind.service
index 12c1401..9bdf489 100644
--- a/rpcbind.service
+++ b/rpcbind.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=RPC bind service
 Requires=rpcbind.socket
+Wants=systemd-tmpfiles-setup.service
+After=systemd-tmpfiles-setup.service
 
 [Service]
 Type=forking
diff --git a/rpcbind.spec b/rpcbind.spec
index b79de14..ee8e911 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.3
-Release:        15.rc2%{?dist}
+Release:        16.rc2%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -83,7 +83,7 @@ install -m644 %{SOURCE1} %{buildroot}/etc/sysconfig/rpcbind
 
 
 %clean
-rm -rf %{buildroot}
+#rm -rf %{buildroot}
 
 %pre
 
@@ -133,6 +133,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Mon Jan 23 2017 Steve Dickson <steved@redhat.com> - 0.2.3-16.rc2
+- Create a systemd dependency for tmpfiles-setup.service (bz 1401561)
+
 * Mon Jan 16 2017 Steve Dickson <steved@redhat.com> - 0.2.3-15.rc2
 - Document /run/rpcbind is the state directory (bz 1401561)