diff -ur Mail-SpamAssassin-4.0.1.orig/INSTALL Mail-SpamAssassin-4.0.1/INSTALL
--- Mail-SpamAssassin-4.0.1.orig/INSTALL	2024-03-26 05:52:27.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/INSTALL	2024-04-22 18:04:33.805233800 +0200
@@ -153,7 +153,7 @@
 /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 @@
     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 -ur Mail-SpamAssassin-4.0.1.orig/ldap/README Mail-SpamAssassin-4.0.1/ldap/README
--- Mail-SpamAssassin-4.0.1.orig/ldap/README	2024-03-26 05:52:28.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/ldap/README	2024-04-22 18:03:02.480038799 +0200
@@ -13,7 +13,7 @@
 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 -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Conf.pm
--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Conf.pm	2024-03-26 05:52:09.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Conf.pm	2024-04-22 18:03:02.480038799 +0200
@@ -40,7 +40,7 @@
 =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 @@
 
 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 -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Phishing.pm
--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm	2024-03-26 05:52:09.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Phishing.pm	2024-04-22 18:03:02.480038799 +0200
@@ -29,8 +29,8 @@
   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_openphish_feed /etc/spamassassin/openphish-feed.txt
+    phishing_phishtank_feed /etc/spamassassin/phishtank-feed.csv
     body     URI_PHISHING      eval:check_phishing()
     describe URI_PHISHING      Url match phishing in feed
   endif
diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Test.pm
--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm	2024-03-26 05:52:10.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Test.pm	2024-04-22 18:03:02.480038799 +0200
@@ -27,7 +27,7 @@
 =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 -ur Mail-SpamAssassin-4.0.1.orig/lib/spamassassin-run.pod Mail-SpamAssassin-4.0.1/lib/spamassassin-run.pod
--- Mail-SpamAssassin-4.0.1.orig/lib/spamassassin-run.pod	2024-03-26 05:52:11.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/lib/spamassassin-run.pod	2024-04-22 18:03:02.480038799 +0200
@@ -41,7 +41,7 @@
  -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 @@
 =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 -ur Mail-SpamAssassin-4.0.1.orig/PACKAGING Mail-SpamAssassin-4.0.1/PACKAGING
--- Mail-SpamAssassin-4.0.1.orig/PACKAGING	2024-03-26 05:52:28.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/PACKAGING	2024-04-22 18:04:14.196977227 +0200
@@ -73,7 +73,7 @@
   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 -ur Mail-SpamAssassin-4.0.1.orig/README Mail-SpamAssassin-4.0.1/README
--- Mail-SpamAssassin-4.0.1.orig/README	2024-03-26 05:52:27.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/README	2024-04-22 18:03:02.480038799 +0200
@@ -114,13 +114,13 @@
         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 @@
         
         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 @@
 	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 -ur Mail-SpamAssassin-4.0.1.orig/rules/init.pre Mail-SpamAssassin-4.0.1/rules/init.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/init.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/init.pre	2024-04-22 18:03:02.480038799 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/user_prefs.template Mail-SpamAssassin-4.0.1/rules/user_prefs.template
--- Mail-SpamAssassin-4.0.1.orig/rules/user_prefs.template	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/user_prefs.template	2024-04-22 18:03:02.480038799 +0200
@@ -5,7 +5,7 @@
 #* directory. At runtime, if a user has no preferences in their home directory
 #* already, it will be copied for them, allowing them to perform personalised
 #* customisation.  If you want to make changes to the site-wide defaults,
-#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
+#* create a file in /etc/spamassassin instead.
 ###########################################################################
 
 # How many points before a mail is considered spam.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v310.pre Mail-SpamAssassin-4.0.1/rules/v310.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v310.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v310.pre	2024-04-22 18:03:02.480038799 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v312.pre Mail-SpamAssassin-4.0.1/rules/v312.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v312.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v312.pre	2024-04-22 18:03:02.480038799 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v320.pre Mail-SpamAssassin-4.0.1/rules/v320.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v320.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v320.pre	2024-04-22 18:03:02.480038799 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v330.pre Mail-SpamAssassin-4.0.1/rules/v330.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v330.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v330.pre	2024-04-22 18:03:02.556039793 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v340.pre Mail-SpamAssassin-4.0.1/rules/v340.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v340.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v340.pre	2024-04-22 18:03:02.556039793 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v341.pre Mail-SpamAssassin-4.0.1/rules/v341.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v341.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v341.pre	2024-04-22 18:03:02.556039793 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v342.pre Mail-SpamAssassin-4.0.1/rules/v342.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v342.pre	2024-03-26 05:52:13.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v342.pre	2024-04-22 18:03:02.556039793 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v343.pre Mail-SpamAssassin-4.0.1/rules/v343.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v343.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v343.pre	2024-04-22 18:04:48.613427568 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v400.pre Mail-SpamAssassin-4.0.1/rules/v400.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v400.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v400.pre	2024-04-22 18:04:51.097460068 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v401.pre Mail-SpamAssassin-4.0.1/rules/v401.pre
--- Mail-SpamAssassin-4.0.1.orig/rules/v401.pre	2024-03-26 05:52:15.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/rules/v401.pre	2024-04-22 18:04:46.201396005 +0200
@@ -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.
diff -ur Mail-SpamAssassin-4.0.1.orig/sa-compile.raw Mail-SpamAssassin-4.0.1/sa-compile.raw
--- Mail-SpamAssassin-4.0.1.orig/sa-compile.raw	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/sa-compile.raw	2024-04-22 18:03:02.556039793 +0200
@@ -679,7 +679,7 @@
   -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 @@
 =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 -ur Mail-SpamAssassin-4.0.1.orig/sa-learn.raw Mail-SpamAssassin-4.0.1/sa-learn.raw
--- Mail-SpamAssassin-4.0.1.orig/sa-learn.raw	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/sa-learn.raw	2024-04-22 18:03:02.556039793 +0200
@@ -661,7 +661,7 @@
  -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 @@
 =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 -ur Mail-SpamAssassin-4.0.1.orig/spamc/spamc.pod Mail-SpamAssassin-4.0.1/spamc/spamc.pod
--- Mail-SpamAssassin-4.0.1.orig/spamc/spamc.pod	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamc/spamc.pod	2024-04-22 18:03:02.556039793 +0200
@@ -310,8 +310,8 @@
 
 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 -ur Mail-SpamAssassin-4.0.1.orig/spamd/README Mail-SpamAssassin-4.0.1/spamd/README
--- Mail-SpamAssassin-4.0.1.orig/spamd/README	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamd/README	2024-04-22 18:03:02.556039793 +0200
@@ -105,7 +105,7 @@
 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 -ur Mail-SpamAssassin-4.0.1.orig/spamd/README.vpopmail Mail-SpamAssassin-4.0.1/spamd/README.vpopmail
--- Mail-SpamAssassin-4.0.1.orig/spamd/README.vpopmail	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamd/README.vpopmail	2024-04-22 18:03:02.556039793 +0200
@@ -43,7 +43,7 @@
 	/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 -ur Mail-SpamAssassin-4.0.1.orig/spamd/spamd.raw Mail-SpamAssassin-4.0.1/spamd/spamd.raw
--- Mail-SpamAssassin-4.0.1.orig/spamd/spamd.raw	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamd/spamd.raw	2024-04-22 18:03:02.556039793 +0200
@@ -3453,7 +3453,7 @@
 =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 -ur Mail-SpamAssassin-4.0.1.orig/spamd/suse-ancient-rc-script.sh Mail-SpamAssassin-4.0.1/spamd/suse-ancient-rc-script.sh
--- Mail-SpamAssassin-4.0.1.orig/spamd/suse-ancient-rc-script.sh	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamd/suse-ancient-rc-script.sh	2024-04-22 18:04:56.913536172 +0200
@@ -285,7 +285,7 @@
 	## Optional: Probe for the necessity of a reload,
 	## give out the argument which is required for a reload.
 
-	test /etc/mail/spamassassin/local.cf -nt $SPAMD_PID && echo force-reload
+	test /etc/spamassassin/local.cf -nt $SPAMD_PID && echo force-reload
 	;;
     *)
 	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
diff -ur Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
--- Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm	2024-04-22 18:03:02.556039793 +0200
@@ -519,7 +519,7 @@
   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 @@
   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 -ur Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
--- Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm	2024-04-22 18:03:02.560039845 +0200
@@ -67,7 +67,7 @@
   # 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 -ur Mail-SpamAssassin-4.0.1.orig/sql/README Mail-SpamAssassin-4.0.1/sql/README
--- Mail-SpamAssassin-4.0.1.orig/sql/README	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/sql/README	2024-04-22 18:03:02.560039845 +0200
@@ -18,7 +18,7 @@
 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 -ur Mail-SpamAssassin-4.0.1.orig/sql/README.awl Mail-SpamAssassin-4.0.1/sql/README.awl
--- Mail-SpamAssassin-4.0.1.orig/sql/README.awl	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/sql/README.awl	2024-04-22 18:03:02.560039845 +0200
@@ -15,7 +15,7 @@
 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 -ur Mail-SpamAssassin-4.0.1.orig/sql/README.txrep Mail-SpamAssassin-4.0.1/sql/README.txrep
--- Mail-SpamAssassin-4.0.1.orig/sql/README.txrep	2024-03-26 05:52:25.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/sql/README.txrep	2024-04-22 18:03:02.560039845 +0200
@@ -16,7 +16,7 @@
 txrep_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 -ur Mail-SpamAssassin-4.0.1.orig/t/data/taintcheckplugin.pm Mail-SpamAssassin-4.0.1/t/data/taintcheckplugin.pm
--- Mail-SpamAssassin-4.0.1.orig/t/data/taintcheckplugin.pm	2024-03-26 05:52:17.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/t/data/taintcheckplugin.pm	2024-04-22 18:03:02.560039845 +0200
@@ -1,6 +1,6 @@
 =head1 taintcheckplugin.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()
diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/testplugin2.pm Mail-SpamAssassin-4.0.1/t/data/testplugin2.pm
--- Mail-SpamAssassin-4.0.1.orig/t/data/testplugin2.pm	2024-03-26 05:52:17.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/t/data/testplugin2.pm	2024-04-22 18:03:02.560039845 +0200
@@ -1,6 +1,6 @@
 =head1 testplugin2.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()
diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/testplugin.pm Mail-SpamAssassin-4.0.1/t/data/testplugin.pm
--- Mail-SpamAssassin-4.0.1.orig/t/data/testplugin.pm	2024-03-26 05:52:17.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/t/data/testplugin.pm	2024-04-22 18:03:02.560039845 +0200
@@ -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()
diff -ur Mail-SpamAssassin-4.0.1.orig/t/sa_compile.t Mail-SpamAssassin-4.0.1/t/sa_compile.t
--- Mail-SpamAssassin-4.0.1.orig/t/sa_compile.t	2024-03-26 05:52:17.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/t/sa_compile.t	2024-04-22 18:03:02.560039845 +0200
@@ -38,7 +38,7 @@
 system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
 
 &new_instdir("basic");
-&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/mail/spamassassin");
+&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/spamassassin");
 
 # we now have an "installed" version we can run sa-compile with.  Ensure
 # sarun() will use it appropriately
@@ -174,7 +174,7 @@
 
   #Create the dir for the pre file
 
-  $file = "$instdir/etc/mail/spamassassin/v330.pre";
+  $file = "$instdir/etc/spamassassin/v330.pre";
   $dir = dirname($file);
   mkpath($dir);
 
diff -ur Mail-SpamAssassin-4.0.1.orig/USAGE Mail-SpamAssassin-4.0.1/USAGE
--- Mail-SpamAssassin-4.0.1.orig/USAGE	2024-03-26 05:52:27.000000000 +0100
+++ Mail-SpamAssassin-4.0.1/USAGE	2024-04-22 18:03:02.560039845 +0200
@@ -120,14 +120,14 @@
 
 
   - 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.