diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile
index c3b7c94f..04be8152 100644
--- a/dovecot/Dockerfile
+++ b/dovecot/Dockerfile
@@ -5,15 +5,16 @@ RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/re
      dovecot \
      dovecot-sqlite \
      dovecot-pigeonhole-plugin \
-     dovecot-antispam-plugin@testing \
-     spamassassin \
+     rspamd-client@testing \
      bash \
- && rm -rf /var/cache/apk/* \
- && sed -i 's,90:65533,90:12,' /etc/passwd
+ && rm -rf /var/cache/apk/*
 
 COPY dovecot-pigeonhole-plugin-extdata-39-r0.apk /
 RUN apk add --allow-untrusted --force dovecot-pigeonhole-plugin-extdata-39-r0.apk
 
+COPY dovecot-antispam-plugin-51-r0.apk /
+RUN apk add --allow-untrusted --force dovecot-antispam-plugin-51-r0.apk
+
 COPY conf /etc/dovecot
 COPY sieve /var/lib/dovecot
 
diff --git a/dovecot/conf/dovecot.conf b/dovecot/conf/dovecot.conf
index 4c55c3b3..a08e04d8 100644
--- a/dovecot/conf/dovecot.conf
+++ b/dovecot/conf/dovecot.conf
@@ -85,7 +85,7 @@ service auth {
 
 service auth-worker {
   unix_listener auth-worker {
-    user = mail
+    user = dovecot
     group = mail
     mode = 0660
   }
@@ -97,7 +97,7 @@ service auth-worker {
 ###############
 
 protocol imap {
-  mail_plugins = $mail_plugins imap_quota
+  mail_plugins = $mail_plugins imap_quota antispam
 }
 
 service imap-login {
@@ -147,4 +147,12 @@ plugin {
 	sieve_default = /var/lib/dovecot/default.sieve
 	sieve_after = /var/lib/dovecot/after.sieve
   sieve_extdata_dict_uri = proxy::sieve
+
+  antispam_backend = mailtrain
+  antispam_spam = Junk
+  antispam_trash = Trash
+  antispam_mail_sendmail = /usr/bin/rspamc
+  antispam_mail_spam = learn_spam
+  antispam_mail_notspam = learn_ham
+  antispam_mail_sendmail_args = -h;antispam:11334;-P;q1
 }
diff --git a/dovecot/dovecot-antispam-plugin-51-r0.apk b/dovecot/dovecot-antispam-plugin-51-r0.apk
new file mode 100644
index 00000000..55036c6d
Binary files /dev/null and b/dovecot/dovecot-antispam-plugin-51-r0.apk differ