diff -ruN clapf-0.3.23.orig/example.conf clapf-0.3.23/example.conf
--- clapf-0.3.23.orig/example.conf	2006-02-02 21:16:45.000000000 +0500
+++ clapf-0.3.23/example.conf	2006-02-18 17:20:18.000000000 +0500
@@ -29,13 +29,13 @@
 backlog=30
 
 ; clapf puts its temporary files here
-workdir=/opt/av
+workdir=/var/lib/clapf
 
 ; enable the quarantine function (1) or not (0)
 use_quarantine=0
 
 ; put virus infected files here if the quarantine function is enabled
-quarantine_dir=/opt/av/quarantine
+quarantine_dir=/var/lib/clapf/quarantine
 
 ; enable the blackhole feature (1) or not (0) - of course only if you have compiled it in
 use_blackhole=0
@@ -67,7 +67,7 @@
 spam_to_train_dir=
 
 ; token spamicity cdb database
-tokensfile=/opt/av/tokens.cdb
+tokensfile=/var/lib/clapf/tokens.cdb
 
 ; skip spam test if the message size is greater than this value (in bytes)
 ; the default (0) means no such a limit
diff -ruN clapf-0.3.23.orig/stat/clapf-rrd-create.sh clapf-0.3.23/stat/clapf-rrd-create.sh
--- clapf-0.3.23.orig/stat/clapf-rrd-create.sh	2006-01-02 15:53:21.000000000 +0500
+++ clapf-0.3.23/stat/clapf-rrd-create.sh	2006-02-18 17:07:05.000000000 +0500
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-RRDTOOL=/usr/local/bin/rrdtool
+RRDTOOL=/usr/bin/rrdtool
 
 if [ $# -ne 2 ]; then echo "usage: $0 <rrd file> <start timestamp>"; exit; fi
 
diff -ruN clapf-0.3.23.orig/stat/clapf-rrd-graph-oneline.sh clapf-0.3.23/stat/clapf-rrd-graph-oneline.sh
--- clapf-0.3.23.orig/stat/clapf-rrd-graph-oneline.sh	2006-01-10 14:51:21.000000000 +0500
+++ clapf-0.3.23/stat/clapf-rrd-graph-oneline.sh	2006-02-18 17:07:10.000000000 +0500
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-RRDTOOL=/usr/local/bin/rrdtool
+RRDTOOL=/usr/bin/rrdtool
 ONEMONTH=2678400
 ONEWEEK=604800
 ONEDAY=86400
diff -ruN clapf-0.3.23.orig/stat/clapf-rrd-graph.sh clapf-0.3.23/stat/clapf-rrd-graph.sh
--- clapf-0.3.23.orig/stat/clapf-rrd-graph.sh	2006-01-02 17:22:55.000000000 +0500
+++ clapf-0.3.23/stat/clapf-rrd-graph.sh	2006-02-18 17:07:14.000000000 +0500
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-RRDTOOL=/usr/local/bin/rrdtool
+RRDTOOL=/usr/bin/rrdtool
 ONEMONTH=2678400
 ONEWEEK=604800
 ONEDAY=86400
diff -ruN clapf-0.3.23.orig/stat/clapf-rrd-update.sh clapf-0.3.23/stat/clapf-rrd-update.sh
--- clapf-0.3.23.orig/stat/clapf-rrd-update.sh	2006-01-02 15:52:48.000000000 +0500
+++ clapf-0.3.23/stat/clapf-rrd-update.sh	2006-02-18 17:07:18.000000000 +0500
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-RRDTOOL=/usr/local/bin/rrdtool
+RRDTOOL=/usr/bin/rrdtool
 
 if [ $# -ne 2 ]; then echo "usage: $0 <rrd file> <timestamp>:<ham>:<spam>"; exit; fi
 
diff -ruN clapf-0.3.23.orig/util/check_clapf.sh clapf-0.3.23/util/check_clapf.sh
--- clapf-0.3.23.orig/util/check_clapf.sh	2005-12-21 18:22:43.000000000 +0500
+++ clapf-0.3.23/util/check_clapf.sh	2006-02-18 17:55:03.000000000 +0500
@@ -6,5 +6,5 @@
 
 NUM=`ps uaxw | grep clapf | grep -c ^av`
 
-if [ $NUM -eq 0 ]; then /bin/su av -c 'export TMPDIR=/opt/av; /usr/local/bin/clapf -c /usr/local/etc/clapf.conf &' ; fi
+if [ $NUM -eq 0 ]; then /bin/su av -c 'export TMPDIR=/var/lib/clapf; /usr/sbin/clapf -c /etc/clapf.conf &' ; fi