diff -Naur openca-0.9.3-rc1/src/scripts/openca-newcert.in openca-0.9.3-rc1.oden/src/scripts/openca-newcert.in
--- openca-0.9.3-rc1/src/scripts/openca-newcert.in	2002-08-12 15:16:32.000000000 +0200
+++ openca-0.9.3-rc1.oden/src/scripts/openca-newcert.in	2007-08-17 13:43:19.000000000 +0200
@@ -58,7 +58,7 @@
 echo
 
 # echo "Importing request into DB ... \c"
-# 	rc=`@prefix@/bin/openca-addreq ${req} ARCHIVIED_REQUEST ${ca}`;
+# 	rc=`@bindir@/openca-addreq ${req} ARCHIVIED_REQUEST ${ca}`;
 # echo "Done."
 # echo
 
@@ -123,7 +123,7 @@
 
 
 ## "Importing certificate into DB ... "
-rc=`@prefix@/bin/openca-addcert $nser $ca`;
+rc=`@bindir@/openca-addcert $nser $ca`;
 
 echo "Cleaning item files ... \c"
 	rm $ca/tmp/* 2>&1 >/dev/null
diff -Naur openca-0.9.3-rc1/src/web-interfaces/node/node.conf.in openca-0.9.3-rc1.oden/src/web-interfaces/node/node.conf.in
--- openca-0.9.3-rc1/src/web-interfaces/node/node.conf.in	2004-12-14 13:29:15.000000000 +0100
+++ openca-0.9.3-rc1.oden/src/web-interfaces/node/node.conf.in	2007-08-17 13:43:19.000000000 +0200
@@ -14,7 +14,7 @@
 sslindex   	"@var_prefix@/crypto/index.txt"
 sslserial  	"@var_prefix@/crypto/serial"
 OCSPindex	"@var_prefix@/crypto/ocsp_index.txt"
-OpenCA_SV_Path	"@EXEC_PREFIX@/bin/openca-sv"
+OpenCA_SV_Path	"@OPENCA_SV@"
 MakePath   	"@MAKE@"
 
 ## General Section
diff -Naur openca-0.9.3-rc1/src/web-interfaces/pub/public.conf.in openca-0.9.3-rc1.oden/src/web-interfaces/pub/public.conf.in
--- openca-0.9.3-rc1/src/web-interfaces/pub/public.conf.in	2005-08-05 12:50:37.000000000 +0200
+++ openca-0.9.3-rc1.oden/src/web-interfaces/pub/public.conf.in	2007-08-17 13:43:19.000000000 +0200
@@ -39,7 +39,7 @@
 ## Paths
 openssl 	"@OPENSSL@"
 sslconfig 	"@etc_prefix@/openssl/openssl.cnf"
-scepPath	"@prefix@/bin/openca-scep"
+scepPath	"@OPENCA_SCEP@"
 tempdir 	"@var_prefix@/tmp"
 
 BP_DIR		"@var_prefix@/batch"