--- debian/patches/40_fix_paths.dpatch.old	2008-12-05 17:32:42.000000000 +0000
+++ debian/patches/40_fix_paths.dpatch	2008-12-05 17:32:32.000000000 +0000
@@ -101,19 +101,18 @@
  
  my($wakeuptime) = 10;  # -w, sleep time in seconds, may be fractional
  my($repeatcount);      # -c, repeat count (when defined)
-diff -urNad pkg-amavisd-new~/amavisd-nanny.rej pkg-amavisd-new/amavisd-nanny.rej
---- pkg-amavisd-new~/amavisd-nanny.rej	1970-01-01 01:00:00.000000000 +0100
-+++ pkg-amavisd-new/amavisd-nanny.rej	2008-05-20 19:29:10.000000000 +0200
-@@ -0,0 +1,9 @@
-+@@ -56,7 +56,7 @@
-+ my($activettl) = 10*60; # stuck active children are sent a SIGTERM
-+                         #   after this many seconds
-+ 
-+-my($db_home) = '/var/amavis/db';  # DB databases directory
-++my($db_home) = '/var/lib/amavis/db';  # DB databases directory
-+ my($dbfile)  = 'nanny.db';
-+ my($wakeuptime) = 2;  # sleep time in seconds, may be fractional
-+ 
+diff -urNad pkg-amavisd-new~/amavisd-agent pkg-amavisd-new/amavisd-agent
+--- pkg-amavisd-new~/amavisd-nanny      2008-12-05 17:30:15.000000000 +0000
++++ pkg-amavisd-new/amavisd-nanny       2008-12-05 17:30:38.000000000 +0000
+@@ -58,7 +58,7 @@
+ 
+ my($dbfile) = 'nanny.db';
+ my($db_home) =  # DB databases directory
+-  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++  defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db';
+ my($wakeuptime) = 2;  # -w, sleep time in seconds, may be fractional
+ my($repeatcount);     # -c, repeat count (when defined)
+ 
 diff -urNad pkg-amavisd-new~/amavisd-release pkg-amavisd-new/amavisd-release
 --- pkg-amavisd-new~/amavisd-release	2008-03-17 15:43:33.000000000 +0100
 +++ pkg-amavisd-new/amavisd-release	2008-05-20 19:29:10.000000000 +0200