diff --git a/ext/debian/puppet-common.dirs b/ext/debian/puppet-common.dirs
index 4f1bbfa8d..7b920412c 100644
--- a/ext/debian/puppet-common.dirs
+++ b/ext/debian/puppet-common.dirs
@@ -1,12 +1,13 @@
 etc/puppet
 etc/puppet/environments
 etc/puppet/environments/example_env
 etc/puppet/environments/example_env/modules
 etc/puppet/environments/example_env/manifests
 etc/puppet/manifests
 etc/puppet/templates
 etc/puppet/modules
 usr/lib/ruby/vendor_ruby
 usr/share/puppet/ext
 var/lib/puppet
 var/log/puppet
+var/run/puppet
diff --git a/ext/debian/puppet-common.postinst b/ext/debian/puppet-common.postinst
index b9021a7bb..7e6220d77 100644
--- a/ext/debian/puppet-common.postinst
+++ b/ext/debian/puppet-common.postinst
@@ -1,35 +1,39 @@
 #!/bin/sh
 
 set -e
 
 if [ "$1" = "configure" ]; then
 
 	# Create the "puppet" user
 	if ! getent passwd puppet > /dev/null; then
 		adduser --quiet --system --group --home /var/lib/puppet  \
 			--no-create-home                                 \
 			--gecos "Puppet configuration management daemon" \
 			puppet
 	fi
 
 	# Set correct permissions and ownership for puppet directories
 	if ! dpkg-statoverride --list /var/log/puppet >/dev/null 2>&1; then
 		dpkg-statoverride --update --add puppet puppet 0750 /var/log/puppet
 	fi
 
 	if ! dpkg-statoverride --list /var/lib/puppet >/dev/null 2>&1; then
 		dpkg-statoverride --update --add puppet puppet 0750 /var/lib/puppet
 	fi
 
+	if ! dpkg-statoverride --list /var/run/puppet >/dev/null 2>&1; then
+		dpkg-statoverride --update --add puppet puppet 0750 /var/run/puppet
+	fi
+
 	# Create folders common to "puppet" and "puppetmaster", which need
 	# to be owned by the "puppet" user
 	install --owner puppet --group puppet --directory \
 		/var/lib/puppet/state
 	
 	# Handle 
 	if [ -d /etc/puppet/ssl ] && [ ! -e /var/lib/puppet/ssl ] && grep -q 'ssldir=/var/lib/puppet/ssl' /etc/puppet/puppet.conf; then
 		mv /etc/puppet/ssl /var/lib/puppet/ssl
 	fi
 fi
 
 #DEBHELPER#