diff --git a/powerman.changes b/powerman.changes
index 44a5bcb..0f857c6 100644
--- a/powerman.changes
+++ b/powerman.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 15 17:24:43 UTC 2017 - eich@suse.com
+
+- Create /usr/lib/tmpfiles.d/powerman.conf:
+  Add systemd handling for temporary directory /var/run/powerman.
+
 -------------------------------------------------------------------
 Wed Jan  4 18:16:09 UTC 2017 - eich@suse.com
 
diff --git a/powerman.spec b/powerman.spec
index d963c16..87f899f 100644
--- a/powerman.spec
+++ b/powerman.spec
@@ -80,6 +80,10 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+%{__mkdir} -p %{buildroot}%{_tmpfilesdir}
+cat >> %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
+d /var/run/powerman 0755 daemon root -
+EOF
 mv %{buildroot}%{_sysconfdir}/powerman/powerman.conf.example %{buildroot}%{_sysconfdir}/powerman/powerman.conf
 rm -r %{buildroot}%{_libdir}/stonith
 %fdupes -s  %{buildroot}
@@ -89,6 +93,7 @@ rm -r %{buildroot}%{_libdir}/stonith
 
 %post
 %service_add_post %{name}.service
+systemd-tmpfiles --create %{_tmpfilesdir}/powerman.conf
 
 %preun
 %service_del_preun %{name}.service
@@ -111,6 +116,7 @@ rm -r %{buildroot}%{_libdir}/stonith
 %attr(0644,root,root) %{_unitdir}/%{name}.service
 %config %{_sysconfdir}/powerman/powerman.conf
 %{_sysconfdir}/powerman/*.dev
+%{_tmpfilesdir}/powerman.conf
 
 %files devel
 %defattr(-,root,root)