Index: spamassassin/INSTALL
===================================================================
--- spamassassin.orig/INSTALL
+++ spamassassin/INSTALL
@@ -408,7 +408,7 @@ is too low for them to be used.
     interpreter.  Version 2.83 or later fixes this.
 
     If you do not plan to use this plugin, be sure to comment out its
-    loadplugin line in "/etc/mail/spamassassin/v310.pre".
+    loadplugin line in "/etc/spamassassin/v310.pre".
 
   - Digest::SHA1 (from CPAN)
 
Index: spamassassin/README
===================================================================
--- spamassassin.orig/README
+++ spamassassin/README
@@ -114,13 +114,13 @@ default locations that Apache SpamAssass
         not modify these, as they are overwritten when you run
         "sa-update".
 
-  - /etc/mail/spamassassin/*.cf:
+  - /etc/spamassassin/*.cf:
 
   	Site config files, for system admins to create, modify, and
 	add local rules and scores to.  Modifications here will be
 	appended to the config loaded from the above directory.
 
-  - /etc/mail/spamassassin/*.pre:
+  - /etc/spamassassin/*.pre:
 
         Plugin control files, installed from the distribution. These are
         used to control what plugins are loaded.  Modifications here will
@@ -129,7 +129,7 @@ default locations that Apache SpamAssass
         
         You want to modify these files if you want to load additional
         plugins, or inhibit loading a plugin that is enabled by default.
-        If the files exist in /etc/mail/spamassassin, they will not
+        If the files exist in /etc/spamassassin, they will not
         be overwritten during future installs.
 
   - /usr/share/spamassassin/user_prefs.template:
@@ -137,14 +137,14 @@ default locations that Apache SpamAssass
 	Distributed default user preferences. Do not modify this, as it is
 	overwritten when you upgrade.
 
-  - /etc/mail/spamassassin/user_prefs.template:
+  - /etc/spamassassin/user_prefs.template:
 
 	Default user preferences, for system admins to create, modify, and
 	set defaults for users' preferences files.  Takes precedence over
 	the above prefs file, if it exists.
 
         Do not put system-wide settings in here; put them in a file in the
-        "/etc/mail/spamassassin" directory ending in ".cf". This file is
+        "/etc/spamassassin" directory ending in ".cf". This file is
         just a template, which will be copied to a user's home directory
         for them to change.
 
Index: spamassassin/USAGE
===================================================================
--- spamassassin.orig/USAGE
+++ spamassassin/USAGE
@@ -120,14 +120,14 @@ Other Installation Notes
 
 
   - You can create your own system-wide rules files in
-    /etc/mail/spamassassin; their filenames should end in ".cf".  Multiple
+    /etc/spamassassin; their filenames should end in ".cf".  Multiple
     files will be read, and SpamAssassin will not overwrite these files
     when installing a new version.
 
 
   - You should not modify the files in /usr/share/spamassassin; these
     will be overwritten when you upgrade.  Any changes you make in
-    files in the /etc/mail/spamassassin directory,  however, will
+    files in the /etc/spamassassin directory,  however, will
     override these files.
 
 
Index: spamassassin/ldap/README
===================================================================
--- spamassassin.orig/ldap/README
+++ spamassassin/ldap/README
@@ -13,7 +13,7 @@ therefore, the only way to have their ow
 database or LDAP server.
 
 SpamAssassin will check the global configuration file (ie. any file matching
-/etc/mail/spamassassin/*.cf) for the following settings:
+/etc/spamassassin/*.cf) for the following settings:
 
   user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
   user_scores_ldap_username	bind dn
Index: spamassassin/lib/Mail/SpamAssassin/Conf.pm
===================================================================
--- spamassassin.orig/lib/Mail/SpamAssassin/Conf.pm
+++ spamassassin/lib/Mail/SpamAssassin/Conf.pm
@@ -40,7 +40,7 @@ Mail::SpamAssassin::Conf - SpamAssassin
 =head1 DESCRIPTION
 
 SpamAssassin is configured using traditional UNIX-style configuration files,
-loaded from the C</usr/share/spamassassin> and C</etc/mail/spamassassin>
+loaded from the C</usr/share/spamassassin> and C</etc/spamassassin>
 directories.
 
 The following web page lists the most important configuration settings
@@ -2846,7 +2846,7 @@ If this option is set to 1 and the messa
 
 These settings differ from the ones above, in that they are considered
 'privileged'.  Only users running C<spamassassin> from their procmailrc's or
-forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can
+forward files, or sysadmins editing a file in C</etc/spamassassin>, can
 use them.   C<spamd> users cannot use them in their C<user_prefs> files, for
 security and efficiency reasons, unless C<allow_user_rules> is enabled (and
 then, they may only add rules from below).
Index: spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
===================================================================
--- spamassassin.orig/lib/Mail/SpamAssassin/Plugin/Test.pm
+++ spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
@@ -27,7 +27,7 @@ Test - test plugin
 =head1 DESCRIPTION
 
 To try this plugin, write the above two lines in the synopsis to
-C</etc/mail/spamassassin/plugintest.cf>.
+C</etc/spamassassin/plugintest.cf>.
 
 =cut
 
Index: spamassassin/lib/spamassassin-run.pod
===================================================================
--- spamassassin.orig/lib/spamassassin-run.pod
+++ spamassassin/lib/spamassassin-run.pod
@@ -41,7 +41,7 @@ Options:
  -p prefs, --prefspath=file, --prefs-file=file
                                    Set user preferences file
  --siteconfigpath=path             Path for site configs
-                                   (def: /etc/mail/spamassassin)
+                                   (def: /etc/spamassassin)
  --cf='config line'                Additional line of configuration
  --pre='config line'               Additional line of ".pre" (prepended to configuration)
  -x, --nocreate-prefs              Don't create user preferences file
@@ -269,7 +269,7 @@ Ignore the default directories (usually
 =item B<--siteconfigpath>=I<path>
 
 Use the specified path for locating site-specific configuration files.  Ignore
-the default directories (usually C</etc/mail/spamassassin> or similar).
+the default directories (usually C</etc/spamassassin> or similar).
 
 =item B<--cf='config line'>
 
Index: spamassassin/sa-compile.raw
===================================================================
--- spamassassin.orig/sa-compile.raw
+++ spamassassin/sa-compile.raw
@@ -679,7 +679,7 @@ Options:
   -p prefs, --prefspath=file, --prefs-file=file
                                 Set user preferences file
   --siteconfigpath=path         Path for site configs
-                                (default: @@PREFIX@@/etc/mail/spamassassin)
+                                (default: @@PREFIX@@/etc/spamassassin)
   --updatedir=path              Directory to place updates
           (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/@@VERSION@@)
   --cf='config line'            Additional line of configuration
@@ -744,7 +744,7 @@ Ignore the default directories (usually
 =item B<--siteconfigpath>=I<path>
 
 Use the specified path for locating site-specific configuration files.  Ignore
-the default directories (usually C</etc/mail/spamassassin> or similar).
+the default directories (usually C</etc/spamassassin> or similar).
 
 =item B<--updatedir>
 
Index: spamassassin/sa-learn.raw
===================================================================
--- spamassassin.orig/sa-learn.raw
+++ spamassassin/sa-learn.raw
@@ -825,7 +825,7 @@ Ignore the default directories (usually
 =item B<--siteconfigpath>=I<path>
 
 Use the specified path for locating site-specific configuration files.  Ignore
-the default directories (usually C</etc/mail/spamassassin> or similar).
+the default directories (usually C</etc/spamassassin> or similar).
 
 =item B<--cf='config line'>
 
Index: spamassassin/spamc/spamc.pod
===================================================================
--- spamassassin.orig/spamc/spamc.pod
+++ spamassassin/spamc/spamc.pod
@@ -310,8 +310,8 @@ any settings in the configuration file.
 
 If the B<-F> switch is specified, that file will be used.  Otherwise,
 C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
-/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>
-switch is not specified, no configuration file will be read.
+/etc/spamassassin). If that file doesn't exist, and the B<-F> switch
+is not specified, no configuration file will be read.
 
 Example:
 
Index: spamassassin/spamd/README
===================================================================
--- spamassassin.orig/spamd/README
+++ spamassassin/spamd/README
@@ -105,7 +105,7 @@ The Bayesian Classifier
 If you plan to use Bayesian classification (the BAYES rules) with spamd,
 you will need to either
 
-  1. modify /etc/mail/spamassassin/local.cf to use a shared database of
+  1. modify /etc/spamassassin/local.cf to use a shared database of
   tokens, by setting the 'bayes_path' setting to a path all users can read
   and write to.  You will also need to set the 'bayes_file_mode' setting
   to 0666 so that created files are shared, too.
Index: spamassassin/spamd/README.vpopmail
===================================================================
--- spamassassin.orig/spamd/README.vpopmail
+++ spamassassin/spamd/README.vpopmail
@@ -43,7 +43,7 @@ then their user_prefs would be stored in
 	/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
 
 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
-This is specified in your /etc/mail/spamassassin/local.cf file.  Perhaps a
+This is specified in your /etc/spamassassin/local.cf file.  Perhaps a
 future enhancement would be to add the capability to have personal AWL db.
 
 6. Of course vpopmail must have the seekable patch installed (see 
Index: spamassassin/spamd/spamd.raw
===================================================================
--- spamassassin.orig/spamd/spamd.raw
+++ spamassassin/spamd/spamd.raw
@@ -3453,7 +3453,7 @@ Ignore the default directories (usually
 =item B<--siteconfigpath>=I<path>
 
 Use the specified path for locating site-specific configuration files.  Ignore
-the default directories (usually C</etc/mail/spamassassin> or similar).
+the default directories (usually C</etc/spamassassin> or similar).
 
 =item B<--cf='config line'>
 
Index: spamassassin/sql/README
===================================================================
--- spamassassin.orig/sql/README
+++ spamassassin/sql/README
@@ -18,7 +18,7 @@ In addition, any config options marked a
 SQL preferences.
 
 SpamAssassin will check the global configuration file (ie. any file matching
-/etc/mail/spamassassin/*.cf) for the following settings:
+/etc/spamassassin/*.cf) for the following settings:
 
   user_scores_dsn		DBI:driver:connection
   user_scores_sql_username	dbusername
Index: spamassassin/sql/README.awl
===================================================================
--- spamassassin.orig/sql/README.awl
+++ spamassassin/sql/README.awl
@@ -15,7 +15,7 @@ so:
 auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList
 
 SpamAssassin will check the global configuration file (ie. any file
-matching /etc/mail/spamassassin/*.cf) for the following settings:
+matching /etc/spamassassin/*.cf) for the following settings:
 
 user_awl_dsn                 DBI:driver:database:hostname[:port]
 user_awl_sql_username        dbusername
Index: spamassassin/t/data/testplugin.pm
===================================================================
--- spamassassin.orig/t/data/testplugin.pm
+++ spamassassin/t/data/testplugin.pm
@@ -1,6 +1,6 @@
 =head1 testplugin.pm
 
-To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
+To try this out, write these lines to /etc/spamassassin/plugintest.cf:
 
   loadplugin     myTestPlugin
   header         MY_TEST_PLUGIN eval:check_test_plugin()
Index: spamassassin/rules/init.pre
===================================================================
--- spamassassin.orig/rules/init.pre
+++ spamassassin/rules/init.pre
@@ -8,7 +8,7 @@
 # already have a file in place called "init.pre".
 #
 # There are now multiple files read to enable plugins in the 
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was 
+# /etc/spamassassin directory; previously only one, "init.pre" was 
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v310.pre
===================================================================
--- spamassassin.orig/rules/v310.pre
+++ spamassassin/rules/v310.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v312.pre
===================================================================
--- spamassassin.orig/rules/v312.pre
+++ spamassassin/rules/v312.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v320.pre
===================================================================
--- spamassassin.orig/rules/v320.pre
+++ spamassassin/rules/v320.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v330.pre
===================================================================
--- spamassassin.orig/rules/v330.pre
+++ spamassassin/rules/v330.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v340.pre
===================================================================
--- spamassassin.orig/rules/v340.pre
+++ spamassassin/rules/v340.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v341.pre
===================================================================
--- spamassassin.orig/rules/v341.pre
+++ spamassassin/rules/v341.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v342.pre
===================================================================
--- spamassassin.orig/rules/v342.pre
+++ spamassassin/rules/v342.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v343.pre
===================================================================
--- spamassassin.orig/rules/v343.pre
+++ spamassassin/rules/v343.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/rules/v400.pre
===================================================================
--- spamassassin.orig/rules/v400.pre
+++ spamassassin/rules/v400.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# /etc/spamassassin directory; previously only one, "init.pre" was
 # read.  Now both "init.pre", "v310.pre", and any other files ending in
 # ".pre" will be read.  As future releases are made, new plugins will be
 # added to new files, named according to the release they're added in.
Index: spamassassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
===================================================================
--- spamassassin.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm
+++ spamassassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
@@ -29,10 +29,10 @@ Mail::SpamAssassin::Plugin::Phishing - c
   loadplugin Mail::SpamAssassin::Plugin::Phishing
 
   ifplugin Mail::SpamAssassin::Plugin::Phishing
-    phishing_openphish_feed /etc/mail/spamassassin/openphish-feed.txt
-    phishing_phishtank_feed /etc/mail/spamassassin/phishtank-feed.csv
-    phishing_phishstats_feed /etc/mail/spamassassin/phishstats-feed.csv
-    phishing_phishing_database_feed /etc/mail/spamassassin/phishing-database-feed.csv
+    phishing_openphish_feed /etc/spamassassin/openphish-feed.txt
+    phishing_phishtank_feed /etc/spamassassin/phishtank-feed.csv
+    phishing_phishstats_feed /etc/spamassassin/phishstats-feed.csv
+    phishing_phishing_database_feed /etc/spamassassin/phishing-database-feed.csv
     body     URI_PHISHING      eval:check_phishing()
     describe URI_PHISHING      Url match phishing in feed
   endif