diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index bd573c4..d3c7d24 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -20,7 +20,7 @@ license=("LGPL")
 
 depends=('krb5' 'openssl' 'sqlite' 'mariadb-libs' 'libsodium'
          'postgresql-libs' 'bzip2' 'lz4' 'expat' 'curl' 'pam')
-makedepends=('libcap' 'libldap' 'lua53' 'xz' 'clucene')
+makedepends=('libcap' 'libldap' 'lua53' 'xz' 'clucene' 'systemd')
 optdepends=('libldap: ldap plugin'
             'lua53: LUA auth and push support'
             'clucene: alternative FTS indexer')
@@ -67,7 +67,6 @@ build() {
     --libexecdir=/usr/lib \
     --with-rundir=/run/dovecot \
     --with-moduledir=/usr/lib/dovecot/modules \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --disable-static \
     --with-nss \
     --with-pam \
@@ -90,6 +89,7 @@ build() {
     --with-libcap \
     --with-docs
 
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
diff --git a/trunk/fix-auth-gssapi.patch b/trunk/fix-auth-gssapi.patch
deleted file mode 100644
index eaa1271..0000000
--- a/trunk/fix-auth-gssapi.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From fea1bacab954d2f112da8a95756f198530e274af Mon Sep 17 00:00:00 2001
-From: "Paul G. Banks" <web@paulbanks.org>
-Date: Sun, 16 Aug 2020 10:57:36 +0100
-Subject: [PATCH] auth: mech-gssapi - GSSAPI can contain NUL.
-
----
- src/auth/mech-gssapi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c
-index f29e48da88..966273d388 100644
---- a/src/auth/mech-gssapi.c
-+++ b/src/auth/mech-gssapi.c
-@@ -735,7 +735,7 @@ mech_gssapi_auth_free(struct auth_request *request)
- const struct mech_module mech_gssapi = {
- 	"GSSAPI",
- 
--	.flags = 0,
-+	.flags = MECH_SEC_ALLOW_NULS,
- 	.passdb_need = MECH_PASSDB_NEED_NOTHING,
- 
- 	mech_gssapi_auth_new,