diff --git a/Shorewall-common/INSTALL b/Shorewall-common/INSTALL
index 71eaad9a0..195ba27c2 100644
--- a/Shorewall-common/INSTALL
+++ b/Shorewall-common/INSTALL
@@ -14,7 +14,7 @@ Shoreline Firewall (Shorewall) Version 4
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
---------------------------------------------------------------------------
diff --git a/Shorewall-common/Makefile-lite b/Shorewall-common/Makefile-lite
index bb7797bd2..1ada083ea 100644
--- a/Shorewall-common/Makefile-lite
+++ b/Shorewall-common/Makefile-lite
@@ -1,6 +1,6 @@
# Shorewall Packet Filtering Firewall Export Directory Makefile - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2006 - Tom Eastep (teastep@shorewall.net)
#
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
################################################################################
# Place this file in each export directory. Modify each copy to set HOST
# to the name of the remote firewall corresponding to the directory.
diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh
index d4fe04a6a..3e0347ec5 100755
--- a/Shorewall-common/fallback.sh
+++ b/Shorewall-common/fallback.sh
@@ -3,7 +3,7 @@
# Script to back out the installation of Shoreline Firewall and to restore the previous version of
# the program
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -20,7 +20,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Usage:
#
diff --git a/Shorewall-common/firewall b/Shorewall-common/firewall
index 7eff0947b..b76b28722 100755
--- a/Shorewall-common/firewall
+++ b/Shorewall-common/firewall
@@ -2,7 +2,7 @@
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-common/init.sh b/Shorewall-common/init.sh
index c261df833..92c3628b8 100755
--- a/Shorewall-common/init.sh
+++ b/Shorewall-common/init.sh
@@ -3,7 +3,7 @@ RCDLINKS="2,S41 3,S41 6,K41"
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -22,7 +22,7 @@ RCDLINKS="2,S41 3,S41 6,K41"
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index 5e05b19d6..9da7b3a94 100755
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@@ -2,7 +2,7 @@
#
# Script to install Shoreline Firewall
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
VERSION=4.0.3
diff --git a/Shorewall-common/ipsecvpn b/Shorewall-common/ipsecvpn
index 8d56a58f3..07f13a663 100644
--- a/Shorewall-common/ipsecvpn
+++ b/Shorewall-common/ipsecvpn
@@ -5,7 +5,7 @@
# ipsecvpn -- script for use on a roadwarrior to start/stop a tunnel-mode
# IPSEC connection
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -20,7 +20,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
RCDLINKS="2,S42 3,S42 6,K42"
diff --git a/Shorewall-common/lib.base b/Shorewall-common/lib.base
index c5efc377b..c6f46fc54 100644
--- a/Shorewall-common/lib.base
+++ b/Shorewall-common/lib.base
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.base
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library contains the code common to all Shorewall components.
#
diff --git a/Shorewall-common/lib.cli b/Shorewall-common/lib.cli
index 2796dc87a..697abfd97 100644
--- a/Shorewall-common/lib.cli
+++ b/Shorewall-common/lib.cli
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.cli.
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library contains the command processing code common to /sbin/shorewall and
# /sbin/shorewall-lite.
diff --git a/Shorewall-common/lib.config b/Shorewall-common/lib.config
index d1e846406..83fd90555 100644
--- a/Shorewall-common/lib.config
+++ b/Shorewall-common/lib.config
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.config
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library contains the configuration file parsing code common to
# /usr/share/shorewall/compiler and /usr/share/shorewall/firewall
diff --git a/Shorewall-common/lib.dynamiczones b/Shorewall-common/lib.dynamiczones
index ad59302f9..86c79404d 100644
--- a/Shorewall-common/lib.dynamiczones
+++ b/Shorewall-common/lib.dynamiczones
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.dynamiczones
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/firewall when processing
# the 'add' and 'delete' commands.
diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index d01856065..821a3f2e1 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -2,7 +2,7 @@
#
# Shorewall Packet Filtering Firewall Control Program - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-common/shorewall.conf b/Shorewall-common/shorewall.conf
index bc03b5c0c..c99c986eb 100644
--- a/Shorewall-common/shorewall.conf
+++ b/Shorewall-common/shorewall.conf
@@ -2,7 +2,7 @@
# /etc/shorewall/shorewall.conf V4.0 - Change the following variables to
# match your setup
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# This file should be placed in /etc/shorewall
#
diff --git a/Shorewall-common/strip b/Shorewall-common/strip
index d11429dcd..cafc22ee8 100755
--- a/Shorewall-common/strip
+++ b/Shorewall-common/strip
@@ -2,7 +2,7 @@
#
# Script for use from Perl to strip config files and perform shell variable
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
###############################################################################
# Filter that expands variables
diff --git a/Shorewall-common/tunnel b/Shorewall-common/tunnel
index 1dc6e5665..a0a3c374c 100755
--- a/Shorewall-common/tunnel
+++ b/Shorewall-common/tunnel
@@ -7,7 +7,7 @@ RCDLINKS="2,S45 3,S45 6,K45"
# Modified - Steve Cowles 5/9/2000
# Incorporated init {start|stop} syntax and iproute2 usage
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh
index 776dd82de..94657084b 100755
--- a/Shorewall-common/uninstall.sh
+++ b/Shorewall-common/uninstall.sh
@@ -2,7 +2,7 @@
#
# Script to back uninstall Shoreline Firewall
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Usage:
#
diff --git a/Shorewall-common/wait4ifup b/Shorewall-common/wait4ifup
index 3e63ba882..e3eae8996 100755
--- a/Shorewall-common/wait4ifup
+++ b/Shorewall-common/wait4ifup
@@ -2,7 +2,7 @@
#
# Shorewall interface helper utility - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh
index 0c8c5c215..4bd40e734 100755
--- a/Shorewall-lite/fallback.sh
+++ b/Shorewall-lite/fallback.sh
@@ -3,7 +3,7 @@
# Script to back out the installation of Shorewall Lite and to restore the previous version of
# the program
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -20,7 +20,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Usage:
#
diff --git a/Shorewall-lite/init.sh b/Shorewall-lite/init.sh
index c41782f0d..48896f3c3 100755
--- a/Shorewall-lite/init.sh
+++ b/Shorewall-lite/init.sh
@@ -3,7 +3,7 @@ RCDLINKS="2,S41 3,S41 6,K41"
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -22,7 +22,7 @@ RCDLINKS="2,S41 3,S41 6,K41"
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index c756c7136..4896a058d 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -2,7 +2,7 @@
#
# Script to install Shoreline Firewall Lite
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
VERSION=4.0.2
diff --git a/Shorewall-lite/shorecap b/Shorewall-lite/shorecap
index 7e1606c72..4cefe6265 100755
--- a/Shorewall-lite/shorecap
+++ b/Shorewall-lite/shorecap
@@ -2,7 +2,7 @@
#
# Shorewall Lite Packet Filtering Firewall Capabilities Detector
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
#
# This program may be used to create a /etc/shorewall/capabilities file for
diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite
index aa31d425c..2e343c7ae 100755
--- a/Shorewall-lite/shorewall-lite
+++ b/Shorewall-lite/shorewall-lite
@@ -2,7 +2,7 @@
#
# Shorewall Lite Packet Filtering Firewall Control Program - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2006 - Tom Eastep (teastep@shorewall.net)
#
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-lite/shorewall-lite.conf b/Shorewall-lite/shorewall-lite.conf
index 4bfc7eefb..3d454802e 100644
--- a/Shorewall-lite/shorewall-lite.conf
+++ b/Shorewall-lite/shorewall-lite.conf
@@ -4,7 +4,7 @@
# compile /var/lib/shorewall-lite/firewall. Those values may be found in
# /var/lib/shorewall-lite/firewall.conf.
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# This file should be placed in /etc/shorewall-lite
#
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 0a7c7b6b5..bf04d0f89 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -2,7 +2,7 @@
#
# Script to back uninstall Shoreline Firewall
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Usage:
#
diff --git a/Shorewall-perl/Shorewall/Accounting.pm b/Shorewall-perl/Shorewall/Accounting.pm
index fdc237cd1..1c29e06b9 100644
--- a/Shorewall-perl/Shorewall/Accounting.pm
+++ b/Shorewall-perl/Shorewall/Accounting.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Accounting.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module contains the code that handles the /etc/shorewall/accounting
# file.
diff --git a/Shorewall-perl/Shorewall/Actions.pm b/Shorewall-perl/Shorewall/Actions.pm
index b6facdfe5..ccc7d6451 100644
--- a/Shorewall-perl/Shorewall/Actions.pm
+++ b/Shorewall-perl/Shorewall/Actions.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Actions.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module contains the code for dealing with actions (built-in,
# standard and user-defined) and Macros.
diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index bd6ad2bc1..460606ada 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Chains.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This is the low-level iptables module. It provides the basic services
# of chain and rule creation. It is used by the higher level modules such
diff --git a/Shorewall-perl/Shorewall/Compiler.pm b/Shorewall-perl/Shorewall/Compiler.pm
index 3d0a15d09..e7e7a2e79 100644
--- a/Shorewall-perl/Shorewall/Compiler.pm
+++ b/Shorewall-perl/Shorewall/Compiler.pm
@@ -2,7 +2,7 @@
#
# The Shoreline Firewall4 (Shorewall-perl) Packet Filtering Firewall Compiler - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
package Shorewall::Compiler;
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 85a49b3da..85d63141e 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Config.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module is responsible for lower level configuration file handling.
# It also exports functions for generating warning and error messages.
diff --git a/Shorewall-perl/Shorewall/FallbackPorts.pm b/Shorewall-perl/Shorewall/FallbackPorts.pm
index 9c491fc2c..1ff432dc9 100644
--- a/Shorewall-perl/Shorewall/FallbackPorts.pm
+++ b/Shorewall-perl/Shorewall/FallbackPorts.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Ports.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module exports the %protocols and %services hashes built from
# /etc/protocols and /etc/services respectively.
diff --git a/Shorewall-perl/Shorewall/IPAddrs.pm b/Shorewall-perl/Shorewall/IPAddrs.pm
index 111f991f0..06e5489f5 100644
--- a/Shorewall-perl/Shorewall/IPAddrs.pm
+++ b/Shorewall-perl/Shorewall/IPAddrs.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/IPAddrs.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module provides interfaces for dealing with IPv4 addresses.
#
diff --git a/Shorewall-perl/Shorewall/Nat.pm b/Shorewall-perl/Shorewall/Nat.pm
index e26a94ed5..4cdc0986c 100644
--- a/Shorewall-perl/Shorewall/Nat.pm
+++ b/Shorewall-perl/Shorewall/Nat.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Nat.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module contains code for dealing with the /etc/shorewall/masq,
# /etc/shorewall/nat and /etc/shorewall/netmap files.
diff --git a/Shorewall-perl/Shorewall/Policy.pm b/Shorewall-perl/Shorewall/Policy.pm
index e9751f145..d63adcce5 100644
--- a/Shorewall-perl/Shorewall/Policy.pm
+++ b/Shorewall-perl/Shorewall/Policy.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Policy.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module deals with the /etc/shorewall/policy file.
#
diff --git a/Shorewall-perl/Shorewall/Proc.pm b/Shorewall-perl/Shorewall/Proc.pm
index b2bcfbc5f..e6ece7aeb 100644
--- a/Shorewall-perl/Shorewall/Proc.pm
+++ b/Shorewall-perl/Shorewall/Proc.pm
@@ -1,7 +1,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall-perl/Shorewall/Proc.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module contains the code that deals with entries in /proc.
#
diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm
index e718331dc..66edaf007 100644
--- a/Shorewall-perl/Shorewall/Providers.pm
+++ b/Shorewall-perl/Shorewall/Providers.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Providers.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module deals with the /etc/shorewall/providers and
# /etc/shorewall/route_rules files.
diff --git a/Shorewall-perl/Shorewall/Proxyarp.pm b/Shorewall-perl/Shorewall/Proxyarp.pm
index 9d2b9d40c..d7e544c0d 100644
--- a/Shorewall-perl/Shorewall/Proxyarp.pm
+++ b/Shorewall-perl/Shorewall/Proxyarp.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Proxyarp.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
#
package Shorewall::Proxyarp;
diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 07a6974be..d13772321 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Rules.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module contains the high-level code for dealing with rules.
#
diff --git a/Shorewall-perl/Shorewall/Tc.pm b/Shorewall-perl/Shorewall/Tc.pm
index a0f9ba95e..f7a3e103b 100644
--- a/Shorewall-perl/Shorewall/Tc.pm
+++ b/Shorewall-perl/Shorewall/Tc.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Tc.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module deals with Traffic Shaping and the tcrules file.
#
diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm
index 37d92d0c3..751704550 100644
--- a/Shorewall-perl/Shorewall/Tunnels.pm
+++ b/Shorewall-perl/Shorewall/Tunnels.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Tunnels.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module handles the /etc/shorewall/tunnels file.
#
diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm
index 197a8e71b..29884dc71 100644
--- a/Shorewall-perl/Shorewall/Zones.pm
+++ b/Shorewall-perl/Shorewall/Zones.pm
@@ -1,7 +1,7 @@
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Zones.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -18,7 +18,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module contains the code which deals with /etc/shorewall/zones,
# /etc/shorewall/interfaces and /etc/shorewall/hosts.
diff --git a/Shorewall-perl/buildports.pl b/Shorewall-perl/buildports.pl
index 16bd0ed3a..0e96b1afe 100755
--- a/Shorewall-perl/buildports.pl
+++ b/Shorewall-perl/buildports.pl
@@ -2,7 +2,7 @@
#
# Tool for building Shorewall::Ports.
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of Version 2 of the GNU General Public License
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Usage:
#
@@ -88,7 +88,7 @@ print <<"EOF";
#
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Ports.pm
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep\@shorewall.net)
#
@@ -105,7 +105,7 @@ print <<"EOF";
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This module exports the %protocols and %services hashes built from
# /etc/protocols and /etc/services respectively.
diff --git a/Shorewall-perl/compiler.pl b/Shorewall-perl/compiler.pl
index f861aaba7..5bb8c62e6 100755
--- a/Shorewall-perl/compiler.pl
+++ b/Shorewall-perl/compiler.pl
@@ -2,7 +2,7 @@
#
# The Shoreline Firewall4 (Shorewall-perl) Packet Filtering Firewall Compiler - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Usage:
#
diff --git a/Shorewall-perl/diff-4.0-lib.base b/Shorewall-perl/diff-4.0-lib.base
index 19d96fb7f..d4268443d 100644
--- a/Shorewall-perl/diff-4.0-lib.base
+++ b/Shorewall-perl/diff-4.0-lib.base
@@ -5,7 +5,7 @@
-#
-# Shorewall 4.0 -- /usr/share/shorewall/lib.base
-#
- # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+ # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -23,7 +23,7 @@
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# This library contains the code common to all Shorewall components.
-#
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index 1f6163252..b5699880f 100755
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@@ -2,7 +2,7 @@
#
# Script to install Shorewall-perl.
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
VERSION=4.0.3
diff --git a/Shorewall-perl/prog.header b/Shorewall-perl/prog.header
index 08d5e6fd1..75f88165a 100644
--- a/Shorewall-perl/prog.header
+++ b/Shorewall-perl/prog.header
@@ -1,4 +1,4 @@
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
diff --git a/Shorewall-shell/INSTALL b/Shorewall-shell/INSTALL
index 19c67d8f7..d6566da04 100644
--- a/Shorewall-shell/INSTALL
+++ b/Shorewall-shell/INSTALL
@@ -14,7 +14,7 @@ Shoreline Firewall (Shorewall) Version 3.4
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
---------------------------------------------------------------------------
If your system supports rpm, I recommend that you install the Shorewall
diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler
index 0135e8e51..0216e59d5 100755
--- a/Shorewall-shell/compiler
+++ b/Shorewall-shell/compiler
@@ -2,7 +2,7 @@
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall Compiler - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh
index bbe8030d0..e7323cd20 100755
--- a/Shorewall-shell/install.sh
+++ b/Shorewall-shell/install.sh
@@ -2,7 +2,7 @@
#
# Script to install Shoreline Firewall
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
VERSION=4.0.3
diff --git a/Shorewall-shell/lib.accounting b/Shorewall-shell/lib.accounting
index b9063a65d..b80ddaa10 100644
--- a/Shorewall-shell/lib.accounting
+++ b/Shorewall-shell/lib.accounting
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.accounting
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when the accounting file is
# non-empty.
diff --git a/Shorewall-shell/lib.actions b/Shorewall-shell/lib.actions
index f2d4c443e..87b255510 100644
--- a/Shorewall-shell/lib.actions
+++ b/Shorewall-shell/lib.actions
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.actions
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when USE_ACTIONS=Yes
# (either explicitly specified or defaulted).
diff --git a/Shorewall-shell/lib.maclist b/Shorewall-shell/lib.maclist
index 3f70d3f69..a5f03f801 100644
--- a/Shorewall-shell/lib.maclist
+++ b/Shorewall-shell/lib.maclist
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.tcrules
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when the maclist option
# is specified in an entry in the interfaces file.
diff --git a/Shorewall-shell/lib.nat b/Shorewall-shell/lib.nat
index 0ec6de7cb..0de655c11 100644
--- a/Shorewall-shell/lib.nat
+++ b/Shorewall-shell/lib.nat
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.nat
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when any of the following
# configuration files are non-empty: masq, nat, netmap; or when there are
diff --git a/Shorewall-shell/lib.providers b/Shorewall-shell/lib.providers
index e9cae466b..5d7e44930 100644
--- a/Shorewall-shell/lib.providers
+++ b/Shorewall-shell/lib.providers
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.providers
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when the providers file is
# non-empty.
diff --git a/Shorewall-shell/lib.proxyarp b/Shorewall-shell/lib.proxyarp
index fd204b0fb..30d3ad7a2 100644
--- a/Shorewall-shell/lib.proxyarp
+++ b/Shorewall-shell/lib.proxyarp
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.proxyarp
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when the 'proxyarp' option is
# specified in the interfaces file or when the proxyarp file is non-empty.
diff --git a/Shorewall-shell/lib.tc b/Shorewall-shell/lib.tc
index 4f225cda7..693efcf87 100644
--- a/Shorewall-shell/lib.tc
+++ b/Shorewall-shell/lib.tc
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.tc
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when TC_ENABLED=Internal
# and the tcdevices and/or the tcclasses file is non-empty. It is also loaded under
diff --git a/Shorewall-shell/lib.tcrules b/Shorewall-shell/lib.tcrules
index a3d30f61d..4ac17aa08 100644
--- a/Shorewall-shell/lib.tcrules
+++ b/Shorewall-shell/lib.tcrules
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.tcrules
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when the tcrules file is
# non-empty. It is also loaded by the compiled firewall script under the same
diff --git a/Shorewall-shell/lib.tunnels b/Shorewall-shell/lib.tunnels
index d25964776..9c6915383 100644
--- a/Shorewall-shell/lib.tunnels
+++ b/Shorewall-shell/lib.tunnels
@@ -2,7 +2,7 @@
#
# Shorewall 4.0 -- /usr/share/shorewall/lib.tunnels
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007 - Tom Eastep (teastep@shorewall.net)
#
@@ -19,7 +19,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# This library is loaded by /usr/share/shorewall/compiler when the tunnels file is
# non-empty.
diff --git a/Shorewall-shell/prog.header b/Shorewall-shell/prog.header
index 751e39621..aac0aa19a 100644
--- a/Shorewall-shell/prog.header
+++ b/Shorewall-shell/prog.header
@@ -2,7 +2,7 @@
#
# Generated by the Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 2006 - Tom Eastep (teastep@shorewall.net)
#
diff --git a/contrib/shoregen/install_shoregen b/contrib/shoregen/install_shoregen
index 3b4fcb5e3..967516f38 100755
--- a/contrib/shoregen/install_shoregen
+++ b/contrib/shoregen/install_shoregen
@@ -21,7 +21,7 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-#
-
\ No newline at end of file
+
diff --git a/docs/XenMyWay.xml b/docs/XenMyWay.xml
index 1ed3763f2..d4a6bbc63 100644
--- a/docs/XenMyWay.xml
+++ b/docs/XenMyWay.xml
@@ -854,7 +854,7 @@ $EXT_IF 30 2*full/10 6*full/10 3
#
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.0
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# (c) 1999,2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
#
@@ -873,7 +873,7 @@ $EXT_IF 30 2*full/10 6*full/10 3
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically stopped.
@@ -1022,4 +1022,4 @@ esac
-
\ No newline at end of file
+
diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 72710a138..f27a53f18 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -4,7 +4,7 @@
# -- (C) 2005,2006 -- Cristian Rodriguez (webmaster@shorewall.net)
# Version : $Id$
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of Version 2 of the GNU General Public License
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# I install this script in /usr/local/bin/makeshorewall.
#
diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 86434b1af..772420ba8 100755
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -4,7 +4,7 @@
# -- (C) 2005,2006 -- Cristian Rodriguez (webmaster@shorewall.net)
# Version : $Id$
#
-# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
+# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of Version 2 of the GNU General Public License
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# I install this script in /usr/local/bin/makeshorewall.
#
diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm
index 628ffa49e..fc3573875 100644
--- a/web/shorewall_index.htm
+++ b/web/shorewall_index.htm
@@ -169,7 +169,7 @@ General Public License for more detail.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free -Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation