diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index 2df21b0..582809b 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -1,6 +1,6 @@
 Name:           tpm2-tss
 Version:        2.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        TPM2.0 Software Stack
 
 # The entire source code is under BSD except implementation.h and tpmb.h which
@@ -33,7 +33,7 @@ APIs for applications to access TPM module through kernel TPM drivers.
 
 %build
 # Use built-in tpm-udev.rules, with specified installation path and prefix.
-%configure --disable-static --disable-silent-rules --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=%{udevrules_prefix}
+%configure --disable-static --disable-silent-rules --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=%{udevrules_prefix} --with-runstatedir=%{_rundir} --with-tmpfilesdir=%{_tmpfilesdir}
 
 # This is to fix Rpath errors. Taken from https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -51,7 +51,7 @@ find %{buildroot}%{_libdir} -type f -name \*.la -delete
 %doc README.md CHANGELOG.md
 %license LICENSE
 %{_sysconfdir}/sysusers.d/tpm2-tss.conf
-%{_sysconfdir}/tmpfiles.d/tpm2-tss-fapi.conf
+%{_tmpfilesdir}/tpm2-tss-fapi.conf
 %{_sysconfdir}/tpm2-tss/
 %{_libdir}/libtss2-mu.so.0*
 %{_libdir}/libtss2-sys.so.0*
@@ -63,7 +63,6 @@ find %{buildroot}%{_libdir} -type f -name \*.la -delete
 %{_libdir}/libtss2-tcti-mssim.so.0*
 %{_udevrulesdir}/%{udevrules_prefix}tpm-udev.rules
 
-
 %package        devel
 Summary:        Headers and libraries for building apps that use tpm2-tss 
 Requires:       %{name}%{_isa} = %{version}-%{release}
@@ -95,6 +94,9 @@ use tpm2-tss.
 
 
 %changelog
+* Fri May 08 2020 Paul Wouters <pwouters@redhat.com> - 2.4.0-3
+- Use proper rundir and tmpfiles macros so proper directories are used
+
 * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 2.4.0-2
 - Rebuild (json-c)