--- nessus-core.orig/configure.in	2005-02-08 02:40:42.000000000 +0100
+++ nessus-core/configure.in	2005-07-03 16:43:12.000000000 +0200
@@ -705,14 +705,16 @@
 dnl Final step : substitute what we want to
 
 NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
+NESSUSD_STATEDIR='${localstatedir}/lib/nessus'
 NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
+NESSUSD_PIDDIR='${localstatedir}/run'
+NESSUSD_PKIDIR='${sysconfdir}/pki/nessus'
 NESSUSD_DATADIR='${sysconfdir}/nessus'
 NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
+NESSUSD_LOGDIR='${localstatedir}/log/nessus'
 
 NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
+NESSUSD_REPORTS='${NESSUSD_LOGDIR}/reports'
 
  
 # The following directories are now passed into the compile
@@ -721,11 +723,11 @@
 # everything works okay.
 #
 #AC_DEFINE_UNQUOTED(NESSUSD_CONFDIR,   "${sysconfdir}")
-#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/nessus'")
+#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/lib/nessus'")
 #AC_DEFINE(NESSUSD_DATADIR,   "'${sysconfdir}/nessus")
 #AC_DEFINE(NESSUSD_LIBDIR,    "${libdir}/nessus")
 #AC_DEFINE(NESSUSD_PLUGINS,   "${libdir}/nessus/plugins")
-#AC_DEFINE(NESSUSD_REPORTS,   "${libdir}/nessus/reports")
+#AC_DEFINE(NESSUSD_REPORTS,   "${localstatedir}/log/nessus/reports")
 man_nessus_1=doc/nessus.1
 man_nessusd_8=doc/nessusd.8
 
@@ -751,6 +753,8 @@
 AC_SUBST(NESSUSD_CONFDIR)
 AC_SUBST(NESSUSD_STATEDIR)
 AC_SUBST(NESSUSD_SHAREDSTATEDIR)
+AC_SUBST(NESSUSD_PIDDIR)
+AC_SUBST(NESSUSD_PKIDIR)
 AC_SUBST(NESSUSD_DATADIR)
 AC_SUBST(NESSUSD_LIBDIR)
 AC_SUBST(NESSUSD_PLUGINS)