diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index ba651a3c6..5f24b2ed6 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -16,6 +16,9 @@ Changes in 4.2.0-Beta1
 
 2)  Allow upper-case A-F in hex representation of MARK in tcclasses.
 
+3)  De-implement DYNAMIC_ZONES=Yes in Shorewall-perl and fix it in
+    Shorewall-shell.
+
 Changes in 4.1.8
 
 1)  Fix some parsing issues with absurd configurations.
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index fb70867af..c255c31e8 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -91,6 +91,13 @@ Problems Corrected in Shorewall-perl 4.2.0 Beta 2
    '!' to specify that matching IP addresses are not members of the
    set. 
 
+Problems Corrected in Shorewall-shell 4.2.0 Beta 2.
+
+1) When DYNAMIC_ZONES=Yes, certain configurations would produce an
+   invalid /var/lib/shorewall/chains file at run-time. The invalid file
+   contents resulted in errors during processing of the "shorewall add"
+   command.
+
 Other Changes in Shoreall 4.2.0 Beta 2.
 
 1) A 'save' extension script is added. The script is run after
diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler
index a1a196304..ccf1a4777 100755
--- a/Shorewall-shell/compiler
+++ b/Shorewall-shell/compiler
@@ -4330,8 +4330,8 @@ activate_rules()
 	fi
 
 	if [ -n "$DYNAMIC_ZONES" ]; then
-	    echo "$FW $zone $chain1" >> $STATEDIR/chains
-	    echo "$zone $FW $chain2" >> $STATEDIR/chains
+	    [ -n "$chain1" ] && echo "$FW $zone $chain1" >> $STATEDIR/chains
+	    [ -n "$chain2" ] && echo "$zone $FW $chain2" >> $STATEDIR/chains
 	fi
 
 	need_broadcast=