diff --git a/openvpn.spec b/openvpn.spec
index ceb0325..77b12ce 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -140,8 +140,8 @@ for plugin in %{plugins} ; do
 done
 
 # tmpfiles.d
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
+install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
 mkdir -p %{buildroot}%{_localstatedir}/run/
 install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 
@@ -189,11 +189,15 @@ fi
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_unitdir}/%{name}@.service
-%dir %{_localstatedir}/run/%{name}/
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%attr(0710,root,openvpn) %dir %{_localstatedir}/run/%{name}/
+%config(noreplace) %{_prefix}/lib/tmpfiles.d/%{name}.conf
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Sep 05 2012 Jon Ciesla <limburgher@gmail.com> 2.2.2-7
+- Fix tmpfiles location, BZ 840188.
+- Fix run ownership, BZ 854440.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild