diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh
index 6633de9ce..012b0f1db 100755
--- a/Shorewall-common/fallback.sh
+++ b/Shorewall-common/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index 47b6a03cd..ec9a6cae2 100755
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/shorewall.spec b/Shorewall-common/shorewall.spec
index 7a8b415c6..f129fc9f0 100644
--- a/Shorewall-common/shorewall.spec
+++ b/Shorewall-common/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 4.0.0
-%define release 0Beta6
+%define release 0Beta7
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -252,6 +252,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
+* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta6
 * Thu Jun 14 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh
index c6930f4a8..ab9b3c2d7 100755
--- a/Shorewall-common/uninstall.sh
+++ b/Shorewall-common/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh
index bcbdb52e3..2b5af8c1a 100755
--- a/Shorewall-lite/fallback.sh
+++ b/Shorewall-lite/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 6e3644aa8..80db89932 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 5755a5711..126c5d185 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,6 +1,6 @@
 %define name shorewall-lite
 %define version 4.0.0
-%define release 0Beta6
+%define release 0Beta7
 %define prefix /usr
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -99,6 +99,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta6
 * Thu Jun 14 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index ce58247b9..565e442a8 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index 8b8c3b68b..325935b74 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -212,6 +212,7 @@ use constant { NULL_STATE => 0 ,   # Generating neither shell commands nor iptab
 	       CMD_STATE  => 2 };  # Generating shell commands.
 
 our $state;
+our $emitted_comment;
 
 #
 # Initialize globals -- we take this novel approach to globals initialization to allow
@@ -302,6 +303,10 @@ sub initialize() {
     # State of the generator.
     #
     $state = NULL_STATE;
+    #
+    #  When true, we've emitted a comment about global variable initialization
+    #
+    $emitted_comment = 0;
 }
 
 INIT {
@@ -1844,8 +1849,6 @@ sub emitr( $ ) {
     }
 }
 
-my $emitted_comment = 0;
-
 sub emit_comment() {
     unless ( $emitted_comment ) {
 	emitj ( '#',
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 36b4aeff8..297445b07 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -128,7 +128,7 @@ sub initialize() {
 		    ORIGINAL_POLICY_MATCH => '',
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
-		    VERSION =>  '4.0.0-Beta6',
+		    VERSION =>  '4.0.0-Beta7',
 		    CAPVERSION => 30405 ,
 		  );
     #
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index d15331aa7..c6ad2bd92 100755
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index 63d948739..a7c1abe6d 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -1,6 +1,6 @@
 %define name shorewall-perl
 %define version 4.0.0
-%define release 0Beta6
+%define release 0Beta7
 %define prefix /usr
 
 Summary: Shoreline Firewall Perl-based compiler.
@@ -91,6 +91,8 @@ fi
 %doc COPYING releasenotes.txt
 
 %changelog
+* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta6
 - Add new components.
diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh
index 21d48552f..e2d465e4d 100755
--- a/Shorewall-shell/install.sh
+++ b/Shorewall-shell/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta6
+VERSION=4.0.0-Beta7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec
index 8d82ec0c2..33b9efb41 100644
--- a/Shorewall-shell/shorewall-shell.spec
+++ b/Shorewall-shell/shorewall-shell.spec
@@ -1,6 +1,6 @@
 %define name shorewall-shell
 %define version 4.0.0
-%define release 0Beta6
+%define release 0Beta7
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING INSTALL 
 
 %changelog
+* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta6
 * Thu Jun 14 2007 Tom Eastep tom@shorewall.net