--- templates/amavisd.conf.template	2005-08-01 18:34:02.000000000 +0200
+++ templates/amavisd.conf.template.oden	2005-08-05 18:11:27.000000000 +0200
@@ -72,8 +72,8 @@
 
 # Set the user and group to which the daemon will change if started as root
 # (otherwise just keeps the UID unchanged, and these settings have no effect):
-$daemon_user  = q{@l_rusr@};	# (no default;  customary: vscan or amavis)
-$daemon_group = q{@l_rgrp@};	# (no default;  customary: vscan or amavis)
+$daemon_user  = q{amavis};	# (no default;  customary: vscan or amavis)
+$daemon_group = q{amavis};	# (no default;  customary: vscan or amavis)
 
 # Runtime working directory (cwd), and a place where
 # temporary directories for unpacking mail are created.
@@ -530,7 +530,7 @@
 #   or a directory (no trailing slash)
 #   (the default value is undef, meaning no quarantine)
 #
-$QUARANTINEDIR = '@l_prefix@/var/amavisd/virusmails';
+$QUARANTINEDIR = '@l_prefix@/var/spool/amavis/virusmails';
 
 #$virus_quarantine_method = "local:virus-%i-%n";    # default
 #$spam_quarantine_method  = "local:spam-%b-%i-%n";  # default
@@ -961,7 +961,7 @@
 # a hash lookup table can be read from a file,
 # one address per line, comments and empty lines are permitted:
 #
-# read_hash(\%whitelist_sender, '@l_prefix@/var/amavisd/whitelist_sender');
+# read_hash(\%whitelist_sender, '@l_prefix@/var/lib/amavis/whitelist_sender');
 
 # ... or set directly:
 
@@ -1012,7 +1012,7 @@
 #$per_recip_whitelist_sender_lookup_tables = {
 # 'user@my.example.com' => [qw( friend@example.org .other.example.org )],
 # '.my1.example.com'    => [qw( !foe.other.example,org .other.example,org )],
-# '.my2.example.com'    => read_hash('@l_prefix@/var/amavisd/my2-wl.dat'),
+# '.my2.example.com'    => read_hash('@l_prefix@/var/lib/amavis/my2-wl.dat'),
 # 'abuse@' => { 'postmaster@'=>1,
 #               'cert-advisory-owner@cert.org'=>1, 'owner-alert@iss.net'=>1 },
 #};
@@ -1213,7 +1213,7 @@
 
  ### http://www.clamav.net/
  ['Clam Antivirus-clamd',
-   \&ask_daemon, ["CONTSCAN {}\n", "@l_prefix@/var/clamav/clamd.sock"],
+   \&ask_daemon, ["CONTSCAN {}\n", "@l_prefix@/var/lib/clamav/clamd.socket"],
    qr/\bOK$/, qr/\bFOUND$/,
    qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
  # NOTE: run clamd under the same user as amavisd;  match the socket
@@ -1437,7 +1437,7 @@
 @av_scanners_backup = (
 
   ### http://www.clamav.net/
-  ['Clam Antivirus - @l_prefix@/bin/clamscan', '@l_prefix@/bin/clamscan',
+  ['Clam Antivirus - @l_prefix@/usr/bin/clamscan', '@l_prefix@/usr/bin/clamscan',
     '--stdout --no-summary -r {}', [0], [1],
     qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],