diff --git a/lockdev.spec b/lockdev.spec
index bc10351..6bf3d46 100644
--- a/lockdev.spec
+++ b/lockdev.spec
@@ -10,7 +10,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.4
-Release: 0.21.%{checkout}%{?dist}
+Release: 0.22.%{checkout}%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: https://alioth.debian.org/projects/lockdev/
@@ -78,6 +78,14 @@ rm -f %{buildroot}%{_libdir}/*.la
 # on reboot re-created by %%{_prefix}/lib/tmpfiles.d/legacy.conf
 mkdir -p %{buildroot}%{_lockdir}
 
+# install /usr/lib/tmpfiles.d/lockdev.conf (#1324184)
+mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}
+cat > ${RPM_BUILD_ROOT}%{_tmpfilesdir}/lockdev.conf <<EOF
+# See tmpfiles.d(5) for details
+
+d %{_lockdir} 0775 root lock -
+EOF
+
 %pre
 getent group lock >/dev/null 2>&1 || groupadd -g 54 -r -f lock >/dev/null 2>&1 || :
 
@@ -92,9 +100,11 @@ fi
 
 
 %files
-%doc COPYING AUTHORS
+%{license} COPYING
+%doc AUTHORS
 %ghost %dir %attr(0775,root,lock) %{_lockdir}
 %attr(2711,root,lock)  %{_sbindir}/lockdev
+%{_tmpfilesdir}/lockdev.conf
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
 
@@ -105,6 +115,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Apr 06 2016 Jiri Popelka <jpopelka@redhat.com> - 1.0.4-0.22.20111007git
+- /run/lock/lockdev no longer created by systemd (#1324184)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-0.21.20111007git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild