diff --git a/dkms.changes b/dkms.changes
index 1e607d1..4348840 100644
--- a/dkms.changes
+++ b/dkms.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 24 11:58:23 UTC 2017 - tchvatal@suse.com
+
+- Update the dkms chrooting to use the tmpfiles macros from systemd
+
 -------------------------------------------------------------------
 Wed Feb  1 09:50:43 UTC 2017 - bumblebee.obs@gmail.com
 
diff --git a/dkms.spec b/dkms.spec
index 17740c0..65be849 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -65,7 +65,7 @@ make install DESTDIR=%{buildroot} \
     BASHDIR=%{buildroot}%{_sysconfdir}/bash_completion.d \
     LIBDIR=%{buildroot}%{_libexecdir}/%{name}
 make install-doc DESTDIR=%{buildroot} \
-    DOCDIR=%{buildroot}%{_datadir}/doc/packages/%{name}
+    DOCDIR=%{buildroot}%{_docdir}/%{name}
 
 # systemd
 mkdir -p %{buildroot}%{_unitdir}
@@ -78,19 +78,23 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdkms
 # remove regular init file
 rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/dkms_autoinstaller
 
+sed -i \
+    -e 's:# tmp_location="/tmp":tmp_location="%{_localstatedir}/tmp/dkms":' \
+    %{buildroot}%{_sysconfdir}/dkms/framework.conf
+
+# Install /usr/lib/tmpfiles.d/dkms.conf
+mkdir -p %{buildroot}%{_tmpfilesdir}
+cat > %{buildroot}%{_tmpfilesdir}/dkms.conf <<EOF
+# See tmpfiles.d(5) for details
+d %{_localstatedir}/tmp/dkms 0700 root root -
+EOF
+
 %pre
 %service_add_pre dkms.service
 exit 0
 
 %post
-# make it more secure
-if [ ! -d %{_tmppath}/dkms ] ;
-then
-  mkdir -p %{_tmppath}/dkms
-  chmod 700 %{_tmppath}/dkms
-fi
-sed -i -e 's,# tmp_location="/tmp",tmp_location="%{_tmppath}/dkms",' %{_sysconfdir}/dkms/framework.conf
-
+%tmpfiles_create %{_tmpfilesdir}/dkms.conf
 # enable on initial install
 %service_add_post dkms.service
 exit 0
@@ -110,6 +114,7 @@ exit 0
 %{_sbindir}/rcdkms
 %{_localstatedir}/lib/%{name}
 %{_libexecdir}/%{name}
+%{_tmpfilesdir}/dkms.conf
 %{_mandir}/*/*
 %config(noreplace) %{_sysconfdir}/%{name}
 %doc sample.spec sample.conf AUTHORS COPYING README.dkms