diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index e6eb2f4..e21e472 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -13,7 +13,7 @@ arch=('x86_64')
 url="https://www.cyrusimap.org/sasl/"
 license=('custom')
 options=('!makeflags')
-makedepends=('postgresql-libs' 'mariadb-libs' 'libldap' 'krb5' 'openssl' 'sqlite')
+makedepends=('postgresql-libs' 'mariadb-libs' 'libldap' 'krb5' 'openssl' 'sqlite' 'libxcrypt')
 source=(https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${pkgver}/cyrus-sasl-${pkgver}.tar.gz{,.sig}
         0003-Update-saslauthd.conf-location-in-documentation.patch
 	0006-Enable-autoconf-maintainer-mode.patch
@@ -36,7 +36,7 @@ sha256sums=('26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5'
             '1a0ae7bd722d57feb6fab12c05eb1922982c68bd9be1c165d405954012e6634f'
             '3c375f8755fdbd98a21c4ee195bebbd2a146901fee327e4dd6cfde7a4dcba7c3'
             '03a57cbcec85602fb8e39b7c8a3ff1a22d2c20a28e771b8b326a570d733bf432'
-            '5c6453050a5f594ca1d53baf3a6188d8f3cdc7a28467ad7c844ad51f663dae9a'
+            '0a61e8041da9bed2ba07211f66a9d9a388d949796e91d042bfa9bc41a760316f'
             'fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640'
             '16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024')
 validpgpkeys=('829F339F8C296FE80F409D93E3D7C118C7B9F46A')
@@ -105,28 +105,8 @@ build() {
   make
 }
 
-package_libsasl() {
-  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl')
-  conflicts=('cyrus-sasl-plugins')
-
-  cd cyrus-sasl-$pkgver
-  make DESTDIR="$pkgdir" install-pkgconfigDATA
-  for dir in include lib sasldb plugins utils; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so*
-  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
-}
-
 package_cyrus-sasl() {
-  depends=("libsasl=${pkgver}" 'krb5' 'pam')
+  depends=("libsasl=${pkgver}" 'libxcrypt' 'krb5' 'pam')
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
diff --git a/trunk/saslauthd.service b/trunk/saslauthd.service
index 978dbd3..a2e1ac3 100644
--- a/trunk/saslauthd.service
+++ b/trunk/saslauthd.service
@@ -5,7 +5,7 @@ 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
 
 [Install]
 WantedBy=multi-user.target