diff --git a/nsd.spec b/nsd.spec
index f00c57d..0c9918e 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -119,6 +119,9 @@ fi
 
 
 %changelog
+* Mon Jul 23 2012 Paul Wouters <pwouters@redhat.com> - 3.2.12-2
+- Add /var/run/nsd via tmpfiles (rhbz#842021)
+
 * Thu Jul 19 2012 Paul Wouters <pwouters@redhat.com> - 3.2.12-1
 - Upgraded to 3.2.12 which fixes CVE-2012-2978 (rhbz#841268)
 
diff --git a/tmpfiles-nsd.conf b/tmpfiles-nsd.conf
index 2598e65..52c1778 100644
--- a/tmpfiles-nsd.conf
+++ b/tmpfiles-nsd.conf
@@ -1 +1 @@
-d /var/run/nsd 0755 root root -
+D /var/run/nsd 0755 nsd nsd -