diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 63e06a93a..1f401bcfa 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -11,3 +11,5 @@ Changes since 2.0.1
 5) Apply Stijn Jonker's fix for CONFIG_PATH.
 
 6) Restore logic to make 'find_file' check for SHOREWALL_DIR separately.
+
+7) Allow CONFIG_PATH to be inherited.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index f21ed0f90..84ca263f7 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5710,7 +5710,7 @@ do_initialize() {
     DISABLE_IPV6=
     BRIDGING=
     DYNAMIC_ZONES=
-    CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+    [ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
 
     stopping=
     have_mutex=
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index d08f721a4..515e96e87 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -631,7 +631,7 @@ FIREWALL=$SHARED_DIR/firewall
 FUNCTIONS=$SHARED_DIR/functions
 VERSION_FILE=$SHARED_DIR/version
 HELP=$SHARED_DIR/help
-CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+[ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
 
 if [ -f $FUNCTIONS ]; then
     . $FUNCTIONS
@@ -649,7 +649,9 @@ else
     exit 2
 fi
 
-[ -z "$CONFIG_PATH" ] && CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+[ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
+
+export CONFIG_PATH
 
 [ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall