diff --git a/Shorewall/compiler b/Shorewall/compiler
index 10eab8534..ce500f528 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -8639,7 +8639,7 @@ do_initialize() {
 
     SHAREDIR=/usr/share/shorewall
     VARDIR=/var/lib/shorewall
-    CONFDIR=/etc/shorewall
+    [ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=/usr/share/shorewall/configfiles
 
     FUNCTIONS=${SHAREDIR}/functions
 
diff --git a/Shorewall/configpath b/Shorewall/configpath
index d438a2732..a79ad82ea 100644
--- a/Shorewall/configpath
+++ b/Shorewall/configpath
@@ -4,4 +4,4 @@
 # /usr/share/shorewall/configpath
 #
 
-CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+CONFIG_PATH=${CONFDIR}:/usr/share/shorewall
diff --git a/Shorewall/functions b/Shorewall/functions
index e9835b44e..8db8113a1 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -248,7 +248,7 @@ find_file()
 
 		IFS=$saveifs
 
-		[ -z "$EXPORT" ] && echo ${CONFDIR}/$1 || echo ${SHAREDIR}/configfiles/$1
+		echo ${CONFDIR}/$1
 	    fi
 	    ;;
     esac
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index c57e89138..c440f4503 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -194,6 +194,8 @@ get_config() {
 
     if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
 
+	export CONFIG_PATH
+	
 	[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
 
 	if [ ! -f $LOGFILE ]; then
@@ -1557,7 +1559,6 @@ else
 fi
 
 ensure_config_path
-export CONFIG_PATH
 
 get_config