diff --git a/Shorewall2/INSTALL b/Shorewall2/INSTALL
index 7805f5c86..4107e8179 100644
--- a/Shorewall2/INSTALL
+++ b/Shorewall2/INSTALL
@@ -1,4 +1,4 @@
-Shoreline Firewall (Shorewall) Version 2.2
+Shoreline Firewall (Shorewall) Version 2.3
 -----         ----
 
 -----------------------------------------------------------------------------
diff --git a/Shorewall2/accounting b/Shorewall2/accounting
index d21c03326..90fcfd673 100644
--- a/Shorewall2/accounting
+++ b/Shorewall2/accounting
@@ -1,5 +1,5 @@
 #
-# Shorewall version 2.2 - Accounting File
+# Shorewall version 2.4 - Accounting File
 #
 # /etc/shorewall/accounting
 #
diff --git a/Shorewall2/action.AllowAuth b/Shorewall2/action.AllowAuth
index af54a9e9c..a23bd787f 100644
--- a/Shorewall2/action.AllowAuth
+++ b/Shorewall2/action.AllowAuth
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowAuth
+# Shorewall 2.4 /usr/share/shorewall/action.AllowAuth
 #
 #	This action accepts Auth (identd) traffic.
 #
diff --git a/Shorewall2/action.AllowDNS b/Shorewall2/action.AllowDNS
index 9887b9795..be8c9defb 100644
--- a/Shorewall2/action.AllowDNS
+++ b/Shorewall2/action.AllowDNS
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowDNS
+# Shorewall 2.4 /usr/share/shorewall/action.AllowDNS
 #
 #	This action accepts DNS traffic.
 #
diff --git a/Shorewall2/action.AllowFTP b/Shorewall2/action.AllowFTP
index 0a0c9951b..da51ece0a 100644
--- a/Shorewall2/action.AllowFTP
+++ b/Shorewall2/action.AllowFTP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowFTP
+# Shorewall 2.4 /usr/share/shorewall/action.AllowFTP
 #
 #	This action accepts FTP traffic. See
 #	http://www.shorewall.net/FTP.html for additional considerations.
diff --git a/Shorewall2/action.AllowICMPs b/Shorewall2/action.AllowICMPs
index 91e462913..4269d3844 100644
--- a/Shorewall2/action.AllowICMPs
+++ b/Shorewall2/action.AllowICMPs
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowICMPs
+# Shorewall 2.4 /usr/share/shorewall/action.AllowICMPs
 #
 #	ACCEPT needed ICMP types
 #
diff --git a/Shorewall2/action.AllowIMAP b/Shorewall2/action.AllowIMAP
index 71e7b15d1..1bb9bed72 100644
--- a/Shorewall2/action.AllowIMAP
+++ b/Shorewall2/action.AllowIMAP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowIMAP
+# Shorewall 2.4 /usr/share/shorewall/action.AllowIMAP
 #
 #	This action accepts IMAP traffic (secure and insecure):
 #
diff --git a/Shorewall2/action.AllowNNTP b/Shorewall2/action.AllowNNTP
index a5d68b49e..92246ce51 100644
--- a/Shorewall2/action.AllowNNTP
+++ b/Shorewall2/action.AllowNNTP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowNNTP
+# Shorewall 2.4 /usr/share/shorewall/action.AllowNNTP
 #
 #	This action accepts NNTP traffic (Usenet) and encrypted NNTP (NNTPS)
 #
diff --git a/Shorewall2/action.AllowNTP b/Shorewall2/action.AllowNTP
index 936954769..de9a57909 100644
--- a/Shorewall2/action.AllowNTP
+++ b/Shorewall2/action.AllowNTP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowNTP
+# Shorewall 2.4 /usr/share/shorewall/action.AllowNTP
 #
 #	This action accepts NTP traffic (ntpd).
 #
diff --git a/Shorewall2/action.AllowPCA b/Shorewall2/action.AllowPCA
index 26b57bdca..3284a9150 100644
--- a/Shorewall2/action.AllowPCA
+++ b/Shorewall2/action.AllowPCA
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowPCA
+# Shorewall 2.4 /usr/share/shorewall/action.AllowPCA
 #
 #	This action accepts PCAnywere (tm)
 #
diff --git a/Shorewall2/action.AllowPOP3 b/Shorewall2/action.AllowPOP3
index 4634b9bbd..c478ca9ea 100644
--- a/Shorewall2/action.AllowPOP3
+++ b/Shorewall2/action.AllowPOP3
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowPOP3
+# Shorewall 2.4 /usr/share/shorewall/action.AllowPOP3
 #
 #	This action accepts POP3 traffic (secure and insecure):
 #
diff --git a/Shorewall2/action.AllowPing b/Shorewall2/action.AllowPing
index 4ef4eeae1..8d7d358c3 100644
--- a/Shorewall2/action.AllowPing
+++ b/Shorewall2/action.AllowPing
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowPing
+# Shorewall 2.4 /usr/share/shorewall/action.AllowPing
 #
 #	This action accepts 'ping' requests.
 #
diff --git a/Shorewall2/action.AllowRdate b/Shorewall2/action.AllowRdate
index 5c1d8054f..14e961d22 100644
--- a/Shorewall2/action.AllowRdate
+++ b/Shorewall2/action.AllowRdate
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowRdate
+# Shorewall 2.4 /usr/share/shorewall/action.AllowRdate
 #
 #	This action accepts remote time retrieval (rdate).
 #
diff --git a/Shorewall2/action.AllowSMB b/Shorewall2/action.AllowSMB
index b7f1e4412..b8d55add0 100644
--- a/Shorewall2/action.AllowSMB
+++ b/Shorewall2/action.AllowSMB
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowSMB
+# Shorewall 2.4 /usr/share/shorewall/action.AllowSMB
 #
 #	Allow Microsoft SMB traffic. You need to invoke this action in
 #	both directions.
diff --git a/Shorewall2/action.AllowSMTP b/Shorewall2/action.AllowSMTP
index 2ad5f2597..d7d8a86c9 100644
--- a/Shorewall2/action.AllowSMTP
+++ b/Shorewall2/action.AllowSMTP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowSMTP
+# Shorewall 2.4 /usr/share/shorewall/action.AllowSMTP
 #
 #	This action accepts SMTP (email) traffic.
 #
diff --git a/Shorewall2/action.AllowSNMP b/Shorewall2/action.AllowSNMP
index 33b1b4c0d..69258bc4b 100644
--- a/Shorewall2/action.AllowSNMP
+++ b/Shorewall2/action.AllowSNMP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowSNMP
+# Shorewall 2.4 /usr/share/shorewall/action.AllowSNMP
 #
 #	This action accepts SNMP traffic (including traps):
 #
diff --git a/Shorewall2/action.AllowSSH b/Shorewall2/action.AllowSSH
index 71ae5adbf..31e26266f 100644
--- a/Shorewall2/action.AllowSSH
+++ b/Shorewall2/action.AllowSSH
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowSSH
+# Shorewall 2.4 /usr/share/shorewall/action.AllowSSH
 #
 #	This action accepts secure shell (SSH) traffic.
 #
diff --git a/Shorewall2/action.AllowTelnet b/Shorewall2/action.AllowTelnet
index 3b06d098a..d0e141e59 100644
--- a/Shorewall2/action.AllowTelnet
+++ b/Shorewall2/action.AllowTelnet
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowTelnet
+# Shorewall 2.4 /usr/share/shorewall/action.AllowTelnet
 #
 #	This action accepts Telnet traffic. For traffic over the
 #	internet, telnet is inappropriate; use SSH instead
diff --git a/Shorewall2/action.AllowTrcrt b/Shorewall2/action.AllowTrcrt
index 9fbce93fa..3c6dd46df 100644
--- a/Shorewall2/action.AllowTrcrt
+++ b/Shorewall2/action.AllowTrcrt
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowTrcrt
+# Shorewall 2.4 /usr/share/shorewall/action.AllowTrcrt
 #
 #	This action accepts Traceroute (for up to 30 hops):
 #
diff --git a/Shorewall2/action.AllowVNC b/Shorewall2/action.AllowVNC
index bf6a40aa9..44724991c 100644
--- a/Shorewall2/action.AllowVNC
+++ b/Shorewall2/action.AllowVNC
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowVNC
+# Shorewall 2.4 /usr/share/shorewall/action.AllowVNC
 #
 #	This action accepts VNC traffic for VNC display's 0 - 9.
 #
diff --git a/Shorewall2/action.AllowVNCL b/Shorewall2/action.AllowVNCL
index 2bcabd2a4..33b2d258e 100755
--- a/Shorewall2/action.AllowVNCL
+++ b/Shorewall2/action.AllowVNCL
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowVNCL
+# Shorewall 2.4 /usr/share/shorewall/action.AllowVNCL
 #
 #	This action accepts VNC traffic from Vncservers to Vncviewers in listen mode.
 #
diff --git a/Shorewall2/action.AllowWeb b/Shorewall2/action.AllowWeb
index f32049606..a8c2693d7 100644
--- a/Shorewall2/action.AllowWeb
+++ b/Shorewall2/action.AllowWeb
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.AllowWeb
+# Shorewall 2.4 /usr/share/shorewall/action.AllowWeb
 #
 #	This action accepts WWW traffic (secure and insecure):
 #
diff --git a/Shorewall2/action.Drop b/Shorewall2/action.Drop
index fc8188d18..4a6acab08 100644
--- a/Shorewall2/action.Drop
+++ b/Shorewall2/action.Drop
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.Drop
+# Shorewall 2.4 /usr/share/shorewall/action.Drop
 #
 #	The default DROP common rules
 #
diff --git a/Shorewall2/action.DropDNSrep b/Shorewall2/action.DropDNSrep
index 760ac92e3..89342d4ff 100644
--- a/Shorewall2/action.DropDNSrep
+++ b/Shorewall2/action.DropDNSrep
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.DropDNSrep
+# Shorewall 2.4 /usr/share/shorewall/action.DropDNSrep
 #
 #	This action silently drops DNS UDP replies
 #
diff --git a/Shorewall2/action.DropPing b/Shorewall2/action.DropPing
index fb079bac6..5efb6872b 100644
--- a/Shorewall2/action.DropPing
+++ b/Shorewall2/action.DropPing
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.DropPing
+# Shorewall 2.4 /usr/share/shorewall/action.DropPing
 #
 #	This action silently drops 'ping' requests.
 #
diff --git a/Shorewall2/action.DropSMB b/Shorewall2/action.DropSMB
index ac2218470..336e77602 100644
--- a/Shorewall2/action.DropSMB
+++ b/Shorewall2/action.DropSMB
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.DropSMB
+# Shorewall 2.4 /usr/share/shorewall/action.DropSMB
 #
 #	This action silently drops Microsoft SMB traffic
 #
diff --git a/Shorewall2/action.DropUPnP b/Shorewall2/action.DropUPnP
index 30a4865f8..68d27acfe 100644
--- a/Shorewall2/action.DropUPnP
+++ b/Shorewall2/action.DropUPnP
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.DropUPnP
+# Shorewall 2.4 /usr/share/shorewall/action.DropUPnP
 #
 #	This action silently drops UPnP probes on UDP port 1900
 #
diff --git a/Shorewall2/action.Reject b/Shorewall2/action.Reject
index 9e116eb22..d12fb66a9 100644
--- a/Shorewall2/action.Reject
+++ b/Shorewall2/action.Reject
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.Reject
+# Shorewall 2.4 /usr/share/shorewall/action.Reject
 #
 #	The default REJECT action common rules
 #
diff --git a/Shorewall2/action.RejectAuth b/Shorewall2/action.RejectAuth
index a89ee4dfc..802e71ab7 100644
--- a/Shorewall2/action.RejectAuth
+++ b/Shorewall2/action.RejectAuth
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.RejectAuth
+# Shorewall 2.4 /usr/share/shorewall/action.RejectAuth
 #
 #	This action silently rejects Auth (tcp 113) traffic
 #
diff --git a/Shorewall2/action.RejectSMB b/Shorewall2/action.RejectSMB
index 19cc5af2d..719b5e3e8 100644
--- a/Shorewall2/action.RejectSMB
+++ b/Shorewall2/action.RejectSMB
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/action.RejectSMB
+# Shorewall 2.4 /usr/share/shorewall/action.RejectSMB
 #
 #	This action silently rejects Microsoft SMB traffic
 #
diff --git a/Shorewall2/action.template b/Shorewall2/action.template
index a5bbce819..c31b61f07 100644
--- a/Shorewall2/action.template
+++ b/Shorewall2/action.template
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /etc/shorewall/action.template
+# Shorewall 2.4 /etc/shorewall/action.template
 #
 #	This file is a template for files with names of the form 
 #	/etc/shorewall/action.<action-name> where <action> is an
diff --git a/Shorewall2/actions b/Shorewall2/actions
index c057929d5..41becaac4 100644
--- a/Shorewall2/actions
+++ b/Shorewall2/actions
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /etc/shorewall/actions
+# Shorewall 2.4 /etc/shorewall/actions
 #
 #	This file allows you to define new ACTIONS for use in rules 
 #	(/etc/shorewall/rules). You define the iptables rules to
diff --git a/Shorewall2/actions.std b/Shorewall2/actions.std
index 7dfb23fcc..c61df8354 100644
--- a/Shorewall2/actions.std
+++ b/Shorewall2/actions.std
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /usr/share/shorewall/actions.std
+# Shorewall 2.4 /usr/share/shorewall/actions.std
 #
 #	Please see http://shorewall.net/Actions.html for additional
 #	information.
diff --git a/Shorewall2/blacklist b/Shorewall2/blacklist
index 8511c3137..800f1be44 100755
--- a/Shorewall2/blacklist
+++ b/Shorewall2/blacklist
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 -- Blacklist File
+# Shorewall 2.4 -- Blacklist File
 #
 # /etc/shorewall/blacklist
 #
diff --git a/Shorewall2/bogons b/Shorewall2/bogons
index 294071162..afb49a555 100644
--- a/Shorewall2/bogons
+++ b/Shorewall2/bogons
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2-- Bogons File
+# Shorewall 2.4 -- Bogons File
 #
 # /etc/shorewall/bogons
 #
diff --git a/Shorewall2/configpath b/Shorewall2/configpath
index f38591919..c31607581 100755
--- a/Shorewall2/configpath
+++ b/Shorewall2/configpath
@@ -1,5 +1,5 @@
 #
-# Shorewall version 2.2 - Default Config Path 
+# Shorewall version 2.4 - Default Config Path 
 #
 # /usr/share/shorewall/configpath
 #
diff --git a/Shorewall2/continue b/Shorewall2/continue
index d1300c577..e65e2c901 100644
--- a/Shorewall2/continue
+++ b/Shorewall2/continue
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/continue
+# Shorewall 2.4 -- /etc/shorewall/continue
 #
 # Add commands below that you want to be executed after shorewall has
 # cleared any existing Netfilter rules and has enabled existing connections.
diff --git a/Shorewall2/ecn b/Shorewall2/ecn
index 77b981b76..f3b43d7ad 100644
--- a/Shorewall2/ecn
+++ b/Shorewall2/ecn
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 - /etc/shorewall/ecn
+# Shorewall 2.4 - /etc/shorewall/ecn
 #
 #	Use this file to list the destinations for which you want to
 #	disable ECN.
diff --git a/Shorewall2/fallback.sh b/Shorewall2/fallback.sh
index 1abc9d2a7..213311a27 100755
--- a/Shorewall2/fallback.sh
+++ b/Shorewall2/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=2.2.4
+VERSION=2.3.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 66392de8d..f6b44290d 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.2
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.3
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
diff --git a/Shorewall2/functions b/Shorewall2/functions
index 66b89e8d4..4da085b32 100755
--- a/Shorewall2/functions
+++ b/Shorewall2/functions
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Shorewall 2.2 -- /usr/share/shorewall/functions
+# Shorewall 2.3 -- /usr/share/shorewall/functions
 
 # Function to truncate a string -- It uses 'cut -b -<n>'
 # rather than ${v:first:last} because light-weight shells like ash and
diff --git a/Shorewall2/help b/Shorewall2/help
index 1ec86f6c0..d5aed8394 100644
--- a/Shorewall2/help
+++ b/Shorewall2/help
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Shorewall help subsystem - V2.2
+# Shorewall help subsystem - V2.4
 #
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
diff --git a/Shorewall2/hosts b/Shorewall2/hosts
index 0016f976d..4dabb7c00 100644
--- a/Shorewall2/hosts
+++ b/Shorewall2/hosts
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 - /etc/shorewall/hosts
+# Shorewall 2.4 - /etc/shorewall/hosts
 #
 #	THE ONLY TIME YOU NEED THIS FILE IS WHERE YOU HAVE MORE THAN
 #	ONE ZONE CONNECTED THROUGH A SINGLE INTERFACE.
diff --git a/Shorewall2/init b/Shorewall2/init
index 571a9b31d..41c49e614 100644
--- a/Shorewall2/init
+++ b/Shorewall2/init
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/init
+# Shorewall 2.4 -- /etc/shorewall/init
 #
 # Add commands below that you want to be executed at the beginning of
 # a "shorewall start" or "shorewall restart" command.
diff --git a/Shorewall2/init.sh b/Shorewall2/init.sh
index 2a7dd230d..efd1d668e 100644
--- a/Shorewall2/init.sh
+++ b/Shorewall2/init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 RCDLINKS="2,S41 3,S41 6,K41"
 #
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.2
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.3
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
diff --git a/Shorewall2/initdone b/Shorewall2/initdone
index 74460af0e..cec87fe90 100755
--- a/Shorewall2/initdone
+++ b/Shorewall2/initdone
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/initdone
+# Shorewall 2.4 -- /etc/shorewall/initdone
 #
 # Add commands below that you want to be executed during 
 # "shorewall start" or "shorewall restart" commands at the point where
diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh
index 16fc1ebcb..51361c40d 100755
--- a/Shorewall2/install.sh
+++ b/Shorewall2/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=2.2.4
+VERSION=2.3.0
 
 usage() # $1 = exit status
 {
@@ -518,7 +518,7 @@ fi
 if [ -f ${PREFIX}/etc/shorewall/started ]; then
     backup_file /etc/shorewall/started
 else
-    run_install -o $OWNER -g $GROUP -m 0600 started ${PREFIX}/etc/shorewall/started
+    run_install -o $OWNERSHIP -m 0600 started ${PREFIX}/etc/shorewall/started
     echo
     echo "Started file installed as ${PREFIX}/etc/shorewall/started"
 fi
diff --git a/Shorewall2/interfaces b/Shorewall2/interfaces
index bbb0c9687..c2314ddb7 100644
--- a/Shorewall2/interfaces
+++ b/Shorewall2/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 -- Interfaces File
+# Shorewall 2.4 -- Interfaces File
 #
 # /etc/shorewall/interfaces
 #
diff --git a/Shorewall2/ipsec b/Shorewall2/ipsec
index b6692d8fd..8e36ed899 100644
--- a/Shorewall2/ipsec
+++ b/Shorewall2/ipsec
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 - /etc/shorewall/ipsec
+# Shorewall 2.4 - /etc/shorewall/ipsec
 #
 #	This file defines the attributes of zones with respect to
 #	IPSEC. To use this file, you must be running a 2.6 kernel and
diff --git a/Shorewall2/maclist b/Shorewall2/maclist
index f364048cd..0835985f1 100644
--- a/Shorewall2/maclist
+++ b/Shorewall2/maclist
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 - MAC list file
+# Shorewall 2.4 - MAC list file
 #
 #	This file is used to define the MAC addresses and optionally their
 #	associated IP addresses to be allowed to use the specified interface.
diff --git a/Shorewall2/masq b/Shorewall2/masq
index 22adaa1b9..cc96de934 100755
--- a/Shorewall2/masq
+++ b/Shorewall2/masq
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 - Masquerade file
+# Shorewall 2.4 - Masquerade file
 #
 # /etc/shorewall/masq
 #
diff --git a/Shorewall2/modules b/Shorewall2/modules
index 4b969b4bb..1d29dabe2 100644
--- a/Shorewall2/modules
+++ b/Shorewall2/modules
@@ -1,5 +1,5 @@
 ##############################################################################
-# Shorewall 2.2 /etc/shorewall/modules
+# Shorewall 2.4 /etc/shorewall/modules
 #
 # This file loads the modules needed by the firewall.
 #
diff --git a/Shorewall2/nat b/Shorewall2/nat
index 5078bec21..2b8b0e87e 100755
--- a/Shorewall2/nat
+++ b/Shorewall2/nat
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.2  -- Network Address Translation Table
+# Shorewall 2.4  -- Network Address Translation Table
 #
 # /etc/shorewall/nat
 #
diff --git a/Shorewall2/netmap b/Shorewall2/netmap
index 8faac6fc1..f9be759df 100644
--- a/Shorewall2/netmap
+++ b/Shorewall2/netmap
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.2  -- Network Mapping Table
+# Shorewall 2.4  -- Network Mapping Table
 #
 # /etc/shorewall/netmap
 #
diff --git a/Shorewall2/params b/Shorewall2/params
index 24d1c94ae..79e2fda61 100644
--- a/Shorewall2/params
+++ b/Shorewall2/params
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 /etc/shorewall/params
+# Shorewall 2.4 /etc/shorewall/params
 #
 # Assign any variables that you need here.
 #
diff --git a/Shorewall2/policy b/Shorewall2/policy
index a6c4b230a..6327c596a 100644
--- a/Shorewall2/policy
+++ b/Shorewall2/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 -- Policy File
+# Shorewall 2.4 -- Policy File
 #
 # /etc/shorewall/policy
 #
diff --git a/Shorewall2/proxyarp b/Shorewall2/proxyarp
index a48fefc53..d9e508976 100644
--- a/Shorewall2/proxyarp
+++ b/Shorewall2/proxyarp
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.2 -- Proxy ARP
+# Shorewall 2.4 -- Proxy ARP
 #
 # /etc/shorewall/proxyarp
 #
diff --git a/Shorewall2/rfc1918 b/Shorewall2/rfc1918
index f728b4491..306efccbf 100644
--- a/Shorewall2/rfc1918
+++ b/Shorewall2/rfc1918
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 -- RFC1918 File
+# Shorewall 2.4 -- RFC1918 File
 #
 # /etc/shorewall/rfc1918
 #
diff --git a/Shorewall2/routestopped b/Shorewall2/routestopped
index 64b0fe504..e3f27be1f 100644
--- a/Shorewall2/routestopped
+++ b/Shorewall2/routestopped
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.2 -- Hosts Accessible when the Firewall is Stopped
+# Shorewall 2.4 -- Hosts Accessible when the Firewall is Stopped
 #
 # /etc/shorewall/routestopped
 #
diff --git a/Shorewall2/rules b/Shorewall2/rules
index 06b40d5a6..79cccc9d6 100755
--- a/Shorewall2/rules
+++ b/Shorewall2/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 2.2 - Rules File
+# Shorewall version 2.4 - Rules File
 #
 # /etc/shorewall/rules
 #
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index 5c19408da..f870aeb4f 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#     Shorewall Packet Filtering Firewall Control Program - V2.2
+#     Shorewall Packet Filtering Firewall Control Program - V2.3
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
diff --git a/Shorewall2/shorewall.conf b/Shorewall2/shorewall.conf
index 55059e803..76850fd5e 100755
--- a/Shorewall2/shorewall.conf
+++ b/Shorewall2/shorewall.conf
@@ -1,5 +1,5 @@
 ##############################################################################
-#  /etc/shorewall/shorewall.conf V2.2 - Change the following variables to
+#  /etc/shorewall/shorewall.conf V2.4 - Change the following variables to
 #  match your setup
 #
 #  This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
diff --git a/Shorewall2/shorewall.spec b/Shorewall2/shorewall.spec
index a538c5d98..3e1c65434 100644
--- a/Shorewall2/shorewall.spec
+++ b/Shorewall2/shorewall.spec
@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 2.2.4
+%define version 2.3.0
 %define release 1
 %define prefix /usr
 
diff --git a/Shorewall2/start b/Shorewall2/start
index 471a8a9b0..10f1655ad 100644
--- a/Shorewall2/start
+++ b/Shorewall2/start
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/start
+# Shorewall 2.4 -- /etc/shorewall/start
 #
 # Add commands below that you want to be executed after shorewall has
 # been started or restarted.
diff --git a/Shorewall2/started b/Shorewall2/started
index 255e0a7ad..8d49213fb 100644
--- a/Shorewall2/started
+++ b/Shorewall2/started
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/started
+# Shorewall 2.4 -- /etc/shorewall/started
 #
 # Add commands below that you want to be executed after shorewall has
 # been completely started or restarted. The difference between this
diff --git a/Shorewall2/stop b/Shorewall2/stop
index 2c4acbdb6..b12ea8d9b 100644
--- a/Shorewall2/stop
+++ b/Shorewall2/stop
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/stop
+# Shorewall 2.4 -- /etc/shorewall/stop
 #
 # Add commands below that you want to be executed at the beginning of a
 # "shorewall stop" command.
diff --git a/Shorewall2/stopped b/Shorewall2/stopped
index b1aa78ab4..997f46755 100644
--- a/Shorewall2/stopped
+++ b/Shorewall2/stopped
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.2 -- /etc/shorewall/stopped
+# Shorewall 2.4 -- /etc/shorewall/stopped
 #
 # Add commands below that you want to be executed at the completion of a
 # "shorewall stop" command.
diff --git a/Shorewall2/tcrules b/Shorewall2/tcrules
index 3a758b262..4b450bdff 100755
--- a/Shorewall2/tcrules
+++ b/Shorewall2/tcrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 2.2 - Traffic Control Rules File
+# Shorewall version 2.4 - Traffic Control Rules File
 #
 # /etc/shorewall/tcrules
 #
diff --git a/Shorewall2/tos b/Shorewall2/tos
index 1a41a5d6c..2b37ddd57 100755
--- a/Shorewall2/tos
+++ b/Shorewall2/tos
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 -- /etc/shorewall/tos
+# Shorewall 2.4 -- /etc/shorewall/tos
 #
 #	This file defines rules for setting Type Of Service (TOS)
 #
diff --git a/Shorewall2/tunnel b/Shorewall2/tunnel
index cd84d7806..ffbe8f6b4 100755
--- a/Shorewall2/tunnel
+++ b/Shorewall2/tunnel
@@ -2,7 +2,7 @@
 
 RCDLINKS="2,S45 3,S45 6,K45"
 ################################################################################
-#   Script to create a gre or ipip tunnel -- Shorewall 2.2
+#   Script to create a gre or ipip tunnel -- Shorewall 2.4
 #
 #   Modified - Steve Cowles 5/9/2000
 #     Incorporated init {start|stop} syntax and iproute2 usage
diff --git a/Shorewall2/tunnels b/Shorewall2/tunnels
index 83a4d7949..e80dd54c4 100644
--- a/Shorewall2/tunnels
+++ b/Shorewall2/tunnels
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.2 - /etc/shorewall/tunnels
+# Shorewall 2.4 - /etc/shorewall/tunnels
 #
 #	This file defines IPSEC, GRE, IPIP and OPENVPN tunnels.
 #
diff --git a/Shorewall2/uninstall.sh b/Shorewall2/uninstall.sh
index 8354f25b7..4a438b936 100755
--- a/Shorewall2/uninstall.sh
+++ b/Shorewall2/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Seattle Firewall
 
-VERSION=2.2.4
+VERSION=2.3.0
 
 usage() # $1 = exit status
 {