diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
old mode 100644
new mode 100755
index bad777dd..0545e198
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Spam filtering with spamassassin via spampd
 #############################################
 
@@ -9,6 +10,7 @@
 # plugin. The tools/mail.py tool creates the necessary sieve script for each mail
 # user when the mail user is created.
 
+source /etc/mailinabox.conf # get global vars
 source setup/functions.sh # load our functions
 
 # Install packages.
@@ -33,13 +35,14 @@ sudo sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins antispam/" /etc/
 # When mail is moved in or out of the Dovecot Spam folder, re-train using this script
 # that sends the mail to spamassassin.
 # from http://wiki2.dovecot.org/Plugins/Antispam
-cat > /usr/bin/sa-learn-pipe.sh << EOF;
+rm -f /usr/bin/sa-learn-pipe.sh # legacy location
+cat > /usr/local/bin/sa-learn-pipe.sh << EOF;
 cat<&0 >> /tmp/sendmail-msg-\$\$.txt
 /usr/bin/sa-learn \$* /tmp/sendmail-msg-\$\$.txt > /dev/null
 rm -f /tmp/sendmail-msg-\$\$.txt
 exit 0
 EOF
-chmod a+x /usr/bin/sa-learn-pipe.sh
+chmod a+x /usr/local/bin/sa-learn-pipe.sh
 
 # Configure the antispam plugin to call sa-learn-pipe.sh.
 cat > /etc/dovecot/conf.d/99-local-spampd.conf << EOF;
@@ -47,12 +50,21 @@ plugin {
     antispam_backend = pipe
     antispam_spam_pattern_ignorecase = SPAM
     antispam_allow_append_to_spam = yes
-    antispam_pipe_program_spam_args = /usr/bin/sa-learn-pipe.sh;--spam
-    antispam_pipe_program_notspam_args = /usr/bin/sa-learn-pipe.sh;--ham
+    antispam_pipe_program_spam_args = /usr/local/bin/sa-learn-pipe.sh;--spam
+    antispam_pipe_program_notspam_args = /usr/local/bin/sa-learn-pipe.sh;--ham
     antispam_pipe_program = /bin/bash
 }
 EOF
 
+# Tell spamassassin where to load and store site-wide bayesean filtering data.
+
+mkdir -p $STORAGE_ROOT/mail/spamassassin
+chown -R mail:mail $STORAGE_ROOT/mail/spamassassin
+chmod -R 775 $STORAGE_ROOT/mail/spamassassin
+
+tools/editconf.py /etc/spamassassin/local.cf -s \
+	bayes_path=$STORAGE_ROOT/mail/spamassassin/bayes
+
 # Initial training?
 # sa-learn --ham storage/mail/mailboxes/*/*/cur/
 # sa-learn --spam storage/mail/mailboxes/*/*/.Spam/cur/