diff --git a/Shorewall-lite/configpath b/Shorewall-lite/configpath
index e71e8245e..2e64e3bf1 100644
--- a/Shorewall-lite/configpath
+++ b/Shorewall-lite/configpath
@@ -4,4 +4,4 @@
 # /usr/share/shorewall-lite/configpath
 #
 
-CONFIG_PATH=/etc/shorewall-lite:/usr/share/shorewall-lite
+CONFIG_PATH=${CONFDIR}/shorewall-lite:${SHAREDIR}/shorewall-lite:${SHAREDIR}/shorewall
diff --git a/Shorewall/configpath b/Shorewall/configpath
index 101957790..fa6300a1e 100644
--- a/Shorewall/configpath
+++ b/Shorewall/configpath
@@ -3,4 +3,4 @@
 #
 # /usr/share/shorewall/configpath
 #
-CONFIG_PATH=${CONFDIR}:${SHAREDIR}/shorewall
+CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall
diff --git a/Shorewall6-lite/configpath b/Shorewall6-lite/configpath
index e71e8245e..c8ceb670e 100644
--- a/Shorewall6-lite/configpath
+++ b/Shorewall6-lite/configpath
@@ -1,7 +1,7 @@
 #
-# Shorewall Lite version 4.1 - Default Config Path
+# Shorewall6 Lite version 4.1 - Default Config Path
 #
 # /usr/share/shorewall-lite/configpath
 #
 
-CONFIG_PATH=/etc/shorewall-lite:/usr/share/shorewall-lite
+CONFIG_PATH=${CONFDIR}/shorewall-lite:${SHAREDIR}/shorewall6-lite:${SHAREDIR}/shorewall
diff --git a/Shorewall6/configpath b/Shorewall6/configpath
index 93f6677ce..0c93600ba 100644
--- a/Shorewall6/configpath
+++ b/Shorewall6/configpath
@@ -3,11 +3,4 @@
 #
 # /usr/share/shorewall6/configpath
 #
-# Note to maintainers.
-#
-#	The CONFDIR variable is normally set to /etc/shorewall6 but when
-#	the command is "compile -e" then CONFDIR is set to
-#	/usr/share/shorewall6/configfiles/. This prevents 'compile -e'
-#	from trying to use configuration information from /etc/shorewall.
-
-CONFIG_PATH=${CONFDIR}:/usr/share/shorewall6:/usr/share/shorewall
+CONFIG_PATH=${CONFDIR}/shorewall6:${SHAREDIR}/shorewall6:${SHAREDIR}/shorewall