diff --git a/lvm2.changes b/lvm2.changes
index 29c5e50..7815baf 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Sep  8 22:20:46 UTC 2013 - crrodriguez@opensuse.org
+
+- Set all "run" directories relative to /run not just the "lock"
+  location
+- Install /usr/lib/tmpfiles.d/lvm2.conf as required to ensure
+  such runtime directories are _always_ there.
+
 -------------------------------------------------------------------
 Wed Aug 28 11:15:54 UTC 2013 - meissner@suse.com
 
diff --git a/lvm2.spec b/lvm2.spec
index 901449d..2e31668 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -107,10 +107,9 @@ PATH=$PATH:/sbin:/usr/sbin \
 	--enable-realtime --enable-pkgconfig \
 	--enable-selinux \
 	--with-clvmd=corosync --with-cluster=internal --with-cluster=internal \
-  --datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm \
-	--enable-cmirrord \
-  --with-thin=internal \
-	--enable-lvmetad
+    --datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm \
+	--enable-cmirrord --with-thin=internal --enable-lvmetad --with-default-pid-dir=/run \
+    --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-tmpfilesdir=%{_prefix}/lib/tmpfiles.d
 export SUSE_ASNEEDED=0
 make -j1 # symlinks are generated in parallel! %{?_smp_mflags}
 
@@ -119,6 +118,7 @@ make install_lvm2 DESTDIR=$RPM_BUILD_ROOT
 make install_system_dirs DESTDIR=$RPM_BUILD_ROOT
 make install_systemd_units DESTDIR=$RPM_BUILD_ROOT
 make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT
+make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT
 make -C liblvm install DESTDIR=$RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup
@@ -171,7 +171,6 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/dm*
 #remove device-mapper systemd events
 rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.socket
 rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service
-
 # install and collect_lvm
 #install -m755 -D %{S:7} $RPM_BUILD_ROOT%{_udevdir}/collect_lvm
 
@@ -205,6 +204,7 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/dm-event.service
 %{_unitdir}/lvm2-monitor.service
 %{_unitdir}/lvm2-lvmetad.socket
 %{_unitdir}/lvm2-lvmetad.service
+%{_prefix}/lib/tmpfiles.d/lvm2.conf
 #%{_udevdir}/collect_lvm
 /lib/mkinitrd/scripts/setup-lvm2.sh
 /lib/mkinitrd/scripts/boot-lvm2.sh