diff --git a/Mail-SpamAssassin/INSTALL b/Mail-SpamAssassin/INSTALL
index 8a3e74b..01bd6dc 100644
--- a/Mail-SpamAssassin/INSTALL
+++ b/Mail-SpamAssassin/INSTALL
@@ -153,7 +153,7 @@ LOCAL_STATE_DIR to that user (usually: chown -R user:user
 /var/lib/spamassassin), you can find out the default directory with
 sa-update --help (look for --updatedir).  Same needs to be done for
 LOCAL_RULES_DIR/sa-update-keys (usually: chown -R user:user
-/etc/mail/spamassassin/sa-update-keys), the directory can be found with
+/etc/spamassassin/sa-update-keys), the directory can be found with
 spamassassin --help (look for --siteconfigpath).
 
 If you wish to install rules from downloaded files, rather than "live" from
@@ -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)
 
diff --git a/Mail-SpamAssassin/PACKAGING b/Mail-SpamAssassin/PACKAGING
index 94ce367..6b89695 100644
--- a/Mail-SpamAssassin/PACKAGING
+++ b/Mail-SpamAssassin/PACKAGING
@@ -73,7 +73,7 @@ PREFIX:
   Samples:
     This will install the spamassassin apps in /foo/bin, the libs in
     /foo/lib/perl5, the shared stuff in /foo/share/spamassassin and make
-    SpamAssassin look for config files in /foo/etc/mail/spamassassin:
+    SpamAssassin look for config files in /foo/etc/spamassassin:
     	perl Makefile.PL PREFIX=/foo
 
 LIB:
diff --git a/Mail-SpamAssassin/README b/Mail-SpamAssassin/README
index 26bbd00..b39880d 100644
--- a/Mail-SpamAssassin/README
+++ b/Mail-SpamAssassin/README
@@ -114,13 +114,13 @@ default locations that Apache SpamAssassin will look at the end.
         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 SpamAssassin will look at the end.
         
         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 SpamAssassin will look at the end.
 	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.
 
diff --git a/Mail-SpamAssassin/USAGE b/Mail-SpamAssassin/USAGE
index f212af3..5d5c7fb 100644
--- a/Mail-SpamAssassin/USAGE
+++ b/Mail-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.
 
 
diff --git a/Mail-SpamAssassin/ldap/README b/Mail-SpamAssassin/ldap/README
index 8f6e995..541fcce 100644
--- a/Mail-SpamAssassin/ldap/README
+++ b/Mail-SpamAssassin/ldap/README
@@ -13,7 +13,7 @@ therefore, the only way to have their own local settings would be through a
 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
diff --git a/Mail-SpamAssassin/lib/Mail/SpamAssassin/Conf.pm b/Mail-SpamAssassin/lib/Mail/SpamAssassin/Conf.pm
index 9cea74a..1684871 100644
--- a/Mail-SpamAssassin/lib/Mail/SpamAssassin/Conf.pm
+++ b/Mail-SpamAssassin/lib/Mail/SpamAssassin/Conf.pm
@@ -40,7 +40,7 @@ Mail::SpamAssassin::Conf - SpamAssassin configuration file
 =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
@@ -2841,7 +2841,7 @@ If this option is set to 1 and the message contains DKIM headers, the headers wi
 
 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).
diff --git a/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm b/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
index 5957bed..9bb7d05 100644
--- a/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
+++ b/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
@@ -29,9 +29,9 @@ Mail::SpamAssassin::Plugin::Phishing - check uris against phishing feed
   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_openphish_feed /etc/spamassassin/openphish-feed.txt
+    phishing_phishtank_feed /etc/spamassassin/phishtank-feed.csv
+    phishing_phishstats_feed /etc/spamassassin/phishstats-feed.csv
     body     URI_PHISHING      eval:check_phishing()
     describe URI_PHISHING      Url match phishing in feed
   endif
diff --git a/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Test.pm b/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Test.pm
index e77681a..4a733c8 100644
--- a/Mail-SpamAssassin/lib/Mail/SpamAssassin/Plugin/Test.pm
+++ b/Mail-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
 
diff --git a/Mail-SpamAssassin/lib/spamassassin-run.pod b/Mail-SpamAssassin/lib/spamassassin-run.pod
index e81defa..7473090 100644
--- a/Mail-SpamAssassin/lib/spamassassin-run.pod
+++ b/Mail-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
@@ -256,7 +256,7 @@ Ignore the default directories (usually C</usr/share/spamassassin> or similar).
 =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'>
 
diff --git a/Mail-SpamAssassin/sa-compile.raw b/Mail-SpamAssassin/sa-compile.raw
index 842cc99..cff1db3 100755
--- a/Mail-SpamAssassin/sa-compile.raw
+++ b/Mail-SpamAssassin/sa-compile.raw
@@ -678,7 +678,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
@@ -743,7 +743,7 @@ Ignore the default directories (usually C</usr/share/spamassassin> or similar).
 =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>
 
diff --git a/Mail-SpamAssassin/sa-learn.raw b/Mail-SpamAssassin/sa-learn.raw
index 5d69ea5..e9e1364 100755
--- a/Mail-SpamAssassin/sa-learn.raw
+++ b/Mail-SpamAssassin/sa-learn.raw
@@ -661,7 +661,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)
  --cf='config line'    Additional line of configuration
  -D, --debug [area,...]  Print debugging messages
  -V, --version         Print version
@@ -825,7 +825,7 @@ Ignore the default directories (usually C</usr/share/spamassassin> or similar).
 =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'>
 
diff --git a/Mail-SpamAssassin/spamc/spamc.pod b/Mail-SpamAssassin/spamc/spamc.pod
index 016182e..0afb937 100644
--- a/Mail-SpamAssassin/spamc/spamc.pod
+++ b/Mail-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:
 
diff --git a/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm b/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
index 8433b37..9f880ee 100644
--- a/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
+++ b/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
@@ -519,7 +519,7 @@ C<@INC>, you can use something like:
   SAtimeout 25
   SAdebug info
   SANew DEF_RULES_DIR "/usr/share/spamassassin"
-  SANew LOCAL_RULES_DIR "/etc/mail/spamassassin"
+  SANew LOCAL_RULES_DIR "/etc/spamassassin"
   SANew LOCAL_STATE_DIR "/var/lib"
   SAUsers local sql
 
@@ -533,7 +533,7 @@ C<@INC>, you can use something like:
   SAtimeout 25
   SAdebug info
   SANew DEF_RULES_DIR "/usr/share/spamassassin"
-  SANew LOCAL_RULES_DIR "/etc/mail/spamassassin"
+  SANew LOCAL_RULES_DIR "/etc/spamassassin"
   SANew LOCAL_STATE_DIR "/var/lib"
 
   LoadModule ident_module /usr/lib/apache/mod_ident.so
diff --git a/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm b/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
index 5ab04f4..fbae31e 100644
--- a/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
+++ b/Mail-SpamAssassin/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
@@ -67,7 +67,7 @@ my %defaults = (
   # substituted at 'make' time
   PREFIX          => '/usr',
   DEF_RULES_DIR   => '/usr/share/spamassassin',
-  LOCAL_RULES_DIR => '/etc/mail/spamassassin',
+  LOCAL_RULES_DIR => '/etc/spamassassin',
   LOCAL_STATE_DIR => '/var/lib',
 );
 
diff --git a/Mail-SpamAssassin/spamd/README b/Mail-SpamAssassin/spamd/README
index cf9b6d5..35a7ddf 100644
--- a/Mail-SpamAssassin/spamd/README
+++ b/Mail-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.
diff --git a/Mail-SpamAssassin/spamd/README.vpopmail b/Mail-SpamAssassin/spamd/README.vpopmail
index 1b2349b..41f88bf 100644
--- a/Mail-SpamAssassin/spamd/README.vpopmail
+++ b/Mail-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 
diff --git a/Mail-SpamAssassin/spamd/spamd.raw b/Mail-SpamAssassin/spamd/spamd.raw
index 1024ec0..e76fef1 100755
--- a/Mail-SpamAssassin/spamd/spamd.raw
+++ b/Mail-SpamAssassin/spamd/spamd.raw
@@ -3450,7 +3450,7 @@ Ignore the default directories (usually C</usr/share/spamassassin> or similar).
 =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'>
 
diff --git a/Mail-SpamAssassin/sql/README b/Mail-SpamAssassin/sql/README
index 62e7ff3..92f8ffc 100644
--- a/Mail-SpamAssassin/sql/README
+++ b/Mail-SpamAssassin/sql/README
@@ -18,7 +18,7 @@ In addition, any config options marked as Admin Only will NOT be parsed from
 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
diff --git a/Mail-SpamAssassin/sql/README.awl b/Mail-SpamAssassin/sql/README.awl
index 19d06c0..eeed860 100644
--- a/Mail-SpamAssassin/sql/README.awl
+++ b/Mail-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
diff --git a/Mail-SpamAssassin/t/data/testplugin.pm b/Mail-SpamAssassin/t/data/testplugin.pm
index 681314c..55aed0c 100644
--- a/Mail-SpamAssassin/t/data/testplugin.pm
+++ b/Mail-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()