diff --git a/PKGBUILD b/PKGBUILD
index f111041..de0a158 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,11 @@
 # Contributor: Miah Johnson <miah (at) chia-pet dot org>
 # Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
+# Contributor: Christian Hesse <mail@eworm.de>
 
 pkgname=puppet
 pkgver=3.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Server automation framework and application"
 arch=('any')
 url="http://puppetlabs.com/puppet/puppet-open-source"
@@ -27,6 +28,12 @@ md5sums=('87535ed8ce3f2013f4232e664ee14f9f')
 package() {
   cd "$srcdir"/$pkgname-$pkgver
 
+  sed -i 's|$vardir/run|/run|g;s|/var/run|/run|g' \
+    "$srcdir"/$pkgname-$pkgver/ext/redhat/$pkgname.conf \
+    "$srcdir"/$pkgname-$pkgver/lib/puppet/face/config.rb \
+    "$srcdir"/$pkgname-$pkgver/lib/puppet/reference/configuration.rb \
+    "$srcdir"/$pkgname-$pkgver/lib/puppet/util/run_mode.rb
+
   ruby install.rb --destdir="$pkgdir"/ --sitelibdir="$( ruby -e \
     'puts RbConfig::CONFIG["vendorlibdir"]' )"
 
@@ -41,7 +48,7 @@ package() {
 
   install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}/
 
-  echo "d /var/run/$pkgname 0755 $pkgname $pkgname -" > \
+  echo "d /run/$pkgname 0755 $pkgname $pkgname -" > \
     "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
 
   # systemd