--- nessus-core.orig/nessus-mkcert-client.in	2004-12-10 20:40:20.000000000 +0100
+++ nessus-core/nessus-mkcert-client.in	2005-07-03 14:31:27.000000000 +0200
@@ -84,8 +84,8 @@
 
 
 
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="@NESSUSD_PKIDIR@/private/CA"
+NESSUSPUB="@NESSUSD_PKIDIR@/CA"
 
 while [ ! -d "$NESSUSPRIV" ]; do
     echo_no_nl "Nessus server 'private' directory: "
@@ -126,7 +126,7 @@
 done
 
 if [ "$R" = "y" ]; then
-    USERSDIR=$localstatedir/nessus/users
+    USERSDIR=$localstatedir/lib/nessus/users
     while [ ! -d "$USERSDIR" ]; do
 	echo "$USERSDIR: not a directory"
 	echo_no_nl "Users directory? "
--- nessus-core.orig/nessus-mkcert.in	2004-12-10 20:40:22.000000000 +0100
+++ nessus-core/nessus-mkcert.in	2005-07-03 15:01:34.000000000 +0200
@@ -92,8 +92,8 @@
    exit 1
 esac
      
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="@NESSUSD_PKIDIR@/private/CA"
+NESSUSPUB="@NESSUSD_PKIDIR@/CA"
 if [ ! -d "$NESSUSPRIV" ]; then
     mkdir -p "$NESSUSPRIV"
     chmod 0700 "$NESSUSPRIV"