diff --git a/PKGBUILD b/PKGBUILD
index b7d79c2..814fef7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,11 @@
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
 
 pkgname=stunnel
 pkgver=5.06
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64')
 url="http://www.stunnel.org"
@@ -19,7 +20,7 @@ source=("https://www.stunnel.org/downloads/$pkgname-$pkgver.tar.gz"{,.asc}
 md5sums=('827901cd4690796eadf17f792b658573'
          'SKIP'
          '579f198ecb90a42fcbfd8a4e48006264'
-         '2e065a39998e57727ee79887bbd1751e')
+         'fa6056e87d81b245678d162fa81198a1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -45,7 +46,7 @@ package() {
   install -Dm644 tools/stunnel.service "$pkgdir/usr/lib/systemd/system/stunnel.service"
   install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf"
 
-  sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \
+  sed -e "s:/usr/var/lib/stunnel/:/run/stunnel:g" \
       -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \
       -e "s:no\(body\|group\):stunnel:g" \
       -i "$pkgdir/etc/stunnel/stunnel.conf-sample"
diff --git a/stunnel.install b/stunnel.install
index d9998e4..1b844ca 100644
--- a/stunnel.install
+++ b/stunnel.install
@@ -6,12 +6,12 @@ post_install() {
 
   # add stunnel user
   if ! getent passwd stunnel >/dev/null 2>&1; then
-    useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel
+    useradd -u 16 -g stunnel -d /run/stunnel -s /bin/false stunnel
   fi
 
   # create chroot dir if necessary.
-  if [ ! -d /var/run/stunnel ]; then
-    install -dm770 -o stunnel -g stunnel /var/run/stunnel
+  if [ ! -d /run/stunnel ]; then
+    install -dm770 -o stunnel -g stunnel /run/stunnel
   fi
 }
 
diff --git a/stunnel.tmpfiles.conf b/stunnel.tmpfiles.conf
index f118e68..4433c8a 100644
--- a/stunnel.tmpfiles.conf
+++ b/stunnel.tmpfiles.conf
@@ -1 +1 @@
-d /var/run/stunnel 0770 stunnel stunnel -
+d /run/stunnel 0770 stunnel stunnel -