diff --git a/configs/dovecot/APKBUILD b/configs/dovecot/APKBUILD
index 08dd83a..8e8f4b7 100644
--- a/configs/dovecot/APKBUILD
+++ b/configs/dovecot/APKBUILD
@@ -2,27 +2,25 @@
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-config-dovecot
 pkgver=2021.01.13
-pkgrel=3
+pkgrel=8
 pkgdesc="Dovecot configuration"
 url="https://git.redxen.eu/RedXen"
 arch="noarch"
 license="none"
-depends="dovecot dovecot-lmtpd dovecot-pgsql dovecot-pigeonhole-plugin redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
+depends="dovecot dovecot-lmtpd dovecot-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
 install="$pkgname.pre-install"
 source="
 	dovecot.conf
 	pgsql.conf
-	rspamd.sieve
 "
 options="!check"
+builddir="$srcdir"
 
 package() {
 	install -Dm644 dovecot.conf "$pkgdir"/etc/dovecot/redxen/dovecot.conf
 	install -Dm644 pgsql.conf "$pkgdir"/etc/dovecot/redxen/pgsql.conf
-	install -Dm644 rspamd.sieve "$pkgdir"/etc/dovecot/redxen/rspamd.sieve
-	install -d "$pkgdir"/var/mail
+	mkdir -p "$pkgdir"/var/mail
 }
 
-sha512sums="12b9bccf6c9578c9608bf2faeba04c4a3660b3932a84d703902446ae5aeee50ac43064bbc8ec640953ab2ec8af2a786098e0e0e6168f56fad700ed9286fb1485  dovecot.conf
-d4646d31915b6fc0df7cc9c06d66c369f6a622f2f0c783fd9463a05a53d1b3b3ba2ebcbe32b2391f0e44fe2a67c6eeeef3b00d3067325152054e184ac67ff745  pgsql.conf
-e305a5ee8196f09d805278acf27a2b66eae9c9e3c6e3458bca391597b1c720c063f8c92034d1af070c750fd0858da7eaa16e75a3b060064eac6b5bcb7b2452e7  rspamd.sieve"
+sha512sums="da3762873a4d61d89c7b0c86257e98c75203b94ac94e52f91f3ef773501a67d59865f6cccf2d8a554f39186a6faee934fb782c654b4d23cdcc8b67e895ca22e5  dovecot.conf
+d4646d31915b6fc0df7cc9c06d66c369f6a622f2f0c783fd9463a05a53d1b3b3ba2ebcbe32b2391f0e44fe2a67c6eeeef3b00d3067325152054e184ac67ff745  pgsql.conf"
diff --git a/configs/dovecot/dovecot.conf b/configs/dovecot/dovecot.conf
index 3093a8f..836d8dc 100644
--- a/configs/dovecot/dovecot.conf
+++ b/configs/dovecot/dovecot.conf
@@ -95,19 +95,3 @@ namespace inbox {
 		autoexpunge = 7d
 	}
 }
-
-protocol lmtp {
-	mail_plugins = $mail_plugins sieve
-}
-plugin {
-	sieve_plugins = sieve_extprograms
-	sieve_extensions = +editheader +mboxmetadata +servermetadata +imapflags +notify +spamtest +spamtestplus +virustest
-
-	sieve_spamtest_status_type = score
-	sieve_spamtest_status_header = X-Spamd-Result: .*? \[([[:digit:]]+\.[[:digit:]]+) / [[:digit:]]+\.[[:digit:]]+\];
-	sieve_spamtest_status_type = text
-	sieve_spamtest_status_header = X-Spam
-	sieve_spamtest_text_value1 = No
-	sieve_spamtest_text_value10 = Yes
-	sieve_default = /etc/dovecot/redxen/rspamd.sieve
-}
diff --git a/configs/dovecot/rspamd.sieve b/configs/dovecot/rspamd.sieve
deleted file mode 100644
index 4802083..0000000
--- a/configs/dovecot/rspamd.sieve
+++ /dev/null
@@ -1,10 +0,0 @@
-require ["fileinto","mailbox"];
-if anyof(
-	header :contains ["X-Spam-Flag"] "YES",
-	header :contains ["X-Spam-Status"] "spam",
-	header :contains ["X-Spam"] "Yes",
-	header :contains ["Subject"] "*** SPAM ***"
-	)
-{
-	fileinto :create "Junk";
-}