diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef35985b..0c3189b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ CHANGELOG
 In Development
 --------------
 
+Mail:
+
+* Fixed a long-standing issue with training the spam filter not working (because of a file permissions issue).
+
 Control panel:
 
 * Munin system monitoring graphs are now zoomable.
diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
index 27576766..ca264c0d 100755
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -78,9 +78,13 @@ tools/editconf.py /etc/spamassassin/local.cf -s \
 # * Writable by the debian-spamd user, which runs /etc/cron.daily/spamassassin.
 #
 # We'll have these files owned by spampd and grant access to the other two processes.
+#
+# Spamassassin will change the access rights back to the defaults, so we must also configure
+# the filemode in the config file.
 
 tools/editconf.py /etc/spamassassin/local.cf -s \
-	bayes_path=$STORAGE_ROOT/mail/spamassassin/bayes
+	bayes_path=$STORAGE_ROOT/mail/spamassassin/bayes \
+	bayes_file_mode=0660
 
 mkdir -p $STORAGE_ROOT/mail/spamassassin
 chown -R spampd:spampd $STORAGE_ROOT/mail/spamassassin