diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 48dbbdd..2f3a1e0 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -13,23 +13,20 @@ pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=(x86_64)
 url="https://www.cyrusimap.org/sasl/"
 license=(custom)
-makedepends=(gdbm glibc krb5 libldap libsasl=$pkgver mariadb-libs openssl pam postgresql-libs sqlite)
+makedepends=(gdbm glibc krb5 libldap libsasl=$pkgver libxcrypt mariadb-libs openssl pam postgresql-libs sqlite)
 source=(
   https://github.com/cyrusimap/$pkgbase/releases/download/$pkgbase-$pkgver/$pkgbase-$pkgver.tar.gz{,.sig}
   saslauthd.service
   saslauthd.conf.d
-  tmpfiles.conf
 )
 sha512sums=('db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78'
             'SKIP'
-            '99573a52c0558d34548cc14e2fc3d95c4b7dc11e0b85f6aba31b1a98d2937d559fed7bb268b88f7ebf929c70e987901b9fe7d406eb74c088628b403a45013197'
-            'e99e2da452d2d5b9c0fc7ef10a844f5aa80f20fe5d5778666e450b5e6eb183876322592ae075d55c7e24d93d8a39bf7d47864697faf398cc40fd589808dd0282'
-            '2cee9d6626aa16b6b51a5f48ad2c162564ce97dabc367738b4d6af654fcd5845e0d2cd78e5c9fb2378dfba2fd67f32fdbfd42321dc59c9a1222369860312d0a7')
+            'c6f2c3e59f0a3cc35b0b9c1bf593d4985d633e30071a246c070ba86e827c530840226a017e9c933df77f94a83d7b5ae0b9299df86e8dcd7220dce5015b6ea028'
+            'e99e2da452d2d5b9c0fc7ef10a844f5aa80f20fe5d5778666e450b5e6eb183876322592ae075d55c7e24d93d8a39bf7d47864697faf398cc40fd589808dd0282')
 b2sums=('6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823'
         'SKIP'
-        'a63fb542a7eb93bb119d655e068ca7a9be71e760298c37f220beae5331ae73c1478fb3d1455e5431a6487bcf0ce7a612e9cdc923e2da5834fc1ae58d810f8e8d'
-        'fd9c1f0a1dd3b812c483e1b119782994b556b997583d75fc905a35ba4d4aae94326b24d0313a3b396fef69d4eb6c7dcbd397144b72fd1b729c590cfba432a275'
-        'e7f38d8c42d48a08b5ca810e237899111856d57635260a5c440cbe8d01ed3dc89541fe7e4d8b84b9d54b1328f17f2c1ea9cf7b6a4a1f37b962bbb6e3cc916da8')
+        'a8d86aa30d73918d24132a117a4dd2ccc478f0d64f6bd07ccd41caec58a275a97d3a74db778309cf0d8253134f903dbdfa56366bf77dfe43d0a889baaf736f92'
+        'fd9c1f0a1dd3b812c483e1b119782994b556b997583d75fc905a35ba4d4aae94326b24d0313a3b396fef69d4eb6c7dcbd397144b72fd1b729c590cfba432a275')
 validpgpkeys=(
   '829F339F8C296FE80F409D93E3D7C118C7B9F46A'  # Partha Susarla <mail@spartha.org>
   'DEA1999F0CDB1AAEBA001E0DBEE3E3B4D2F06546'  # Quanah Gibson-Mount <quanah@fast-mail.org>
@@ -74,7 +71,7 @@ build() {
       --with-mysql=/usr \
       --with-pam \
       --with-pgsql=/usr/lib \
-      --with-saslauthd=/var/run/saslauthd \
+      --with-saslauthd=/run/saslauthd \
       --with-sqlite3=/usr/lib
   # prevent excessive overlinking by libtool
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -86,7 +83,7 @@ check() {
 }
 
 package_cyrus-sasl() {
-  depends=(gdbm libgdbm.so glibc krb5 libkrb5.so libldap libsasl=$pkgver openssl pam libpam.so)
+  depends=(gdbm libgdbm.so glibc krb5 libkrb5.so libldap libsasl=$pkgver libxcrypt openssl pam libpam.so)
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=(etc/conf.d/saslauthd)
 
@@ -96,7 +93,6 @@ package_cyrus-sasl() {
 
   install -vDm 644 saslauthd.conf.d "$pkgdir/etc/conf.d/saslauthd"
   install -vDm 644 saslauthd.service -t "$pkgdir/usr/lib/systemd/system/"
-  install -vDm 644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/saslauthd.conf"
 }
 
 package_cyrus-sasl-gssapi() {
diff --git a/trunk/saslauthd.service b/trunk/saslauthd.service
index 978dbd3..cf8d1d4 100644
--- a/trunk/saslauthd.service
+++ b/trunk/saslauthd.service
@@ -5,7 +5,8 @@ Description=Cyrus SASL authentication daemon
 Type=forking
 EnvironmentFile=/etc/conf.d/saslauthd
 ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
-PIDFile=/var/run/saslauthd/saslauthd.pid
+PIDFile=/run/saslauthd/saslauthd.pid
+RuntimeDirectory=saslauthd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/trunk/tmpfiles.conf b/trunk/tmpfiles.conf
deleted file mode 100644
index 7258b1a..0000000
--- a/trunk/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/saslauthd 0755 root root - -