--- kolabd-1.9.4/templates/clamd.conf.template.orig	2005-07-18 18:33:14.000000000 -0300
+++ kolabd-1.9.4/templates/clamd.conf.template	2005-07-18 18:35:11.000000000 -0300
@@ -13,7 +13,7 @@
 # LogFile must be writable for the user running daemon.
 # A full path is required.
 # Default: disabled
-LogFile @l_prefix@/var/clamav/clamd.log
+LogFile @l_prefix@/var/log/clamav/clamd.log
 
 # By default the log file is locked for writing - the lock protects against
 # running clamd multiple times (if want to run another clamd, please
@@ -56,22 +56,22 @@
 # This option allows you to save a process identifier of the listening
 # daemon (main thread).
 # Default: disabled
-PidFile @l_prefix@/var/clamav/clamd.pid
+PidFile @l_prefix@/var/run/clamav/clamd.pid
 
 # Optional path to the global temporary directory.
 # Default: system specific (usually /tmp or /var/tmp).
-#TemporaryDirectory /var/tmp
+#TemporaryDirectory /var/lib/clamav/tmp
 
 # Path to the database directory.
 # Default: hardcoded (depends on installation options)
-DatabaseDirectory @l_prefix@/share/clamav
+DatabaseDirectory @l_prefix@/var/lib/clamav
 
 # The daemon works in a local OR a network mode. Due to security reasons we
 # recommend the local mode.
 
 # Path to a local socket file the daemon will listen on.
 # Default: disabled
-LocalSocket @l_prefix@/var/clamav/clamd.sock
+LocalSocket @l_prefix@/var/lib/clamav/clamd.socket
 
 # Remove stale socket after unclean shutdown.
 # Default: disabled
@@ -143,7 +143,7 @@
 
 # Run as a selected user (clamd must be started by root).
 # Default: disabled
-User @l_rusr@
+User clamav
 
 # Initialize supplementary group access (clamd must be started by root).
 # Default: disabled
--- kolabd-1.9.4/templates/freshclam.conf.template~	2005-06-09 18:32:25.000000000 -0300
+++ kolabd-1.9.4/templates/freshclam.conf.template	2005-07-18 18:44:45.000000000 -0300
@@ -13,11 +13,11 @@
 # Path to the database directory.
 # WARNING: It must match clamd.conf's directive!
 # Default: hardcoded (depends on installation options)
-DatabaseDirectory @l_prefix@/share/clamav
+DatabaseDirectory @l_prefix@/var/lib/clamav
 
 # Path to the log file (make sure it has proper permissions)
 # Default: disabled
-UpdateLogFile @l_prefix@/var/clamav/freshclam.log
+UpdateLogFile @l_prefix@/var/log/clamav/freshclam.log
 
 # Enable verbose logging.
 # Default: disabled
@@ -34,12 +34,12 @@
 
 # This option allows you to save the process identifier of the daemon
 # Default: disabled
-#PidFile /var/run/freshclam.pid
+#PidFile /var/run/clamav/freshclam.pid
 
 # By default when started freshclam drops privileges and switches to the
 # "clamav" user. This directive allows you to change the database owner.
 # Default: clamav (may depend on installation options)
-#DatabaseOwner clamav
+DatabaseOwner clamav
 
 # Initialize supplementary group access (freshclam must be started by root).
 # Default: disabled
@@ -87,7 +87,7 @@
 #NotifyClamd @l_prefix@/etc/clamav/clamd.conf
 # By default it uses the hardcoded configuration file but you can force an
 # another one.
-NotifyClamd @l_prefix@/etc/clamav/clamd.conf
+NotifyClamd @l_prefix@/etc/clamd.conf
 
 # Run command after successful database update.
 # Default: disabled