diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 795b911..ccd08aa 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -18,9 +18,9 @@ source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz
         turnserver.sysusers.d
         turnserver.tmpfiles.d)
 sha256sums=('8eabe4c241ad9a74655d8516c69b1fa3275e020e7f7fca50a6cb822809e7c220'
-            'b6d4007e898e59ed280d665fc3f995cd41c0a2363ddea87d75f80be6398cad19'
+            '32d0ef62663bcbda0b5c7d324d156ce83605861c3ce63536bc57b5f0e5ba6f5c'
             '92e51ecd664ab53031baa0aeee615fa7c4e73f79c5a3ebc49ac8e0919e4d23fd'
-            '3b6ca82bb420404098e4b8563c246c450571f403e8f1b5acf3256f2b7c042f21')
+            'd765d14ff3a6527498257e4dc9e76231742cd41d8fe658004e171b8937db6a75')
 
 build() {
   cd coturn-$pkgver
@@ -50,13 +50,13 @@ package() {
   cd "$pkgdir"
 
   # Create needed directories
-  mkdir -p {etc/turnserver,var/log/turnserver}
+  install -dm 700 "$pkgdir"/etc/turnserver
 
   # Use Arch-specific directories in config
   mv {usr/etc/turnserver.conf.default,etc/turnserver/turnserver.conf}
   sed \
     -e '/^#log-file=\/var\/tmp\/turn.log$/c log-file=\/var\/log\/turnserver\/turn.log' \
-    -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile=\/var\/run\/turnserver\/turnserver.pid' \
+    -e '/^#pidfile="\/var\/run\/turnserver.pid"$/c pidfile=\/run\/turnserver\/turnserver.pid' \
     -i etc/turnserver/turnserver.conf
   rmdir usr/etc
 
diff --git a/trunk/turnserver.service b/trunk/turnserver.service
index 8321256..9fd60a8 100644
--- a/trunk/turnserver.service
+++ b/trunk/turnserver.service
@@ -6,6 +6,9 @@ After=network.target
 User=turnserver
 Type=forking
 ExecStart=/usr/bin/turnserver -c /etc/turnserver/turnserver.conf -o -v
+RuntimeDirectory=turnserver
+LogsDirectory=turnserver
+RuntimeDirectoryMode=0700
 
 [Install]
 WantedBy=multi-user.target
diff --git a/trunk/turnserver.tmpfiles.d b/trunk/turnserver.tmpfiles.d
index 7551578..18e4e0b 100644
--- a/trunk/turnserver.tmpfiles.d
+++ b/trunk/turnserver.tmpfiles.d
@@ -1,3 +1,2 @@
 d /etc/turnserver 0700 turnserver turnserver
-z /etc/turnserver/turnserver.conf 0600 turnserver turnserver
-d /run/turnserver 0700 turnserver turnserver
+Z /etc/turnserver/turnserver.conf 0600 turnserver turnserver