Prepare for Spamassassin Upgrade