--- easyrsa
+++ easyrsa
@@ -885,7 +885,7 @@ vars_setup() {
 	local vars=
 
 	# set up program path
-	local prog_vars="${0%/*}/vars"
+	local prog_vars="PREFIX/share/easy-rsa"
 
 	# command-line path:
 	if [ -f "$EASYRSA_VARS_FILE" ]; then
@@ -910,9 +910,9 @@ Note: using Easy-RSA configuration from: $vars"
 	fi
 	
 	# Set defaults, preferring existing env-vars if present
-	set_var EASYRSA		"$PWD"
+	set_var EASYRSA		"PREFIX/share/easy-rsa"
 	set_var EASYRSA_OPENSSL	openssl
-	set_var EASYRSA_PKI	"$EASYRSA/pki"
+	set_var EASYRSA_PKI	"$PWD/pki"
 	set_var EASYRSA_DN	cn_only
 	set_var EASYRSA_REQ_COUNTRY	"US"
 	set_var EASYRSA_REQ_PROVINCE	"California"
--- vars.example
+++ vars.example
@@ -42,7 +42,7 @@ fi
 # This variable should point to the top level of the easy-rsa tree. By default,
 # this is taken to be the directory you are currently in.
 
-#set_var EASYRSA	"$PWD"
+#set_var EASYRSA	"PREFIX/share/easy-rsa"
 
 # If your OpenSSL command is not in the system PATH, you will need to define the
 # path to it here. Normally this means a full path to the executable, otherwise
@@ -62,7 +62,7 @@ fi
 # WARNING: init-pki will do a rm -rf on this directory so make sure you define
 # it correctly! (Interactive mode will prompt before acting.)
 
-#set_var EASYRSA_PKI		"$EASYRSA/pki"
+#set_var EASYRSA_PKI		"$PWD/pki"
 
 # Define X509 DN mode.
 # This is used to adjust what elements are included in the Subject field as the DN