diff --git a/Shorewall/INSTALL b/Shorewall/INSTALL
index 340a94d9f..70e46fabb 100644
--- a/Shorewall/INSTALL
+++ b/Shorewall/INSTALL
@@ -1,4 +1,4 @@
-Shoreline Firewall (Shorewall) Version 2.0 - 3/14/2003
+Shoreline Firewall (Shorewall) Version 1.4 - 3/14/2003
 -----         ----
 
 -----------------------------------------------------------------------------
diff --git a/Shorewall/blacklist b/Shorewall/blacklist
index 3367f76fc..234935e05 100755
--- a/Shorewall/blacklist
+++ b/Shorewall/blacklist
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 -- Blacklist File
+# Shorewall 1.4 -- Blacklist File
 #
 # /etc/shorewall/blacklist
 #
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 1a6a37dfc..a5ba3df89 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -1,6 +1,6 @@
 Changes since 1.3.14
 
-1. All versions changed to 2.0.
+1. All versions changed to 1.4.
 
 2. Rework of error message generation to make the 'firewall' script
    smaller.
@@ -28,3 +28,7 @@ Changes since 1.3.14
 
 12. Corrected rule number calculation problem in 'shorewall add' command
     processing.
+
+13. Update Documentation for 1.4
+
+13. Remove icmp.def file.
diff --git a/Shorewall/common.def b/Shorewall/common.def
index 4170898ea..af8c11522 100644
--- a/Shorewall/common.def
+++ b/Shorewall/common.def
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.0 -- /etc/shorewall/common.def
+# Shorewall 1.4 -- /etc/shorewall/common.def
 #
 # This file defines the rules that are applied before a policy of 
 # DROP or REJECT is applied. In addition to the rules defined in this file,
diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh
index 0e6fd46a6..22222ecfb 100755
--- a/Shorewall/fallback.sh
+++ b/Shorewall/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of 
 #       Shoreline Firewall.
 
-VERSION=2.0.0Alpha1
+VERSION=1.4.0Alpha1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/firewall b/Shorewall/firewall
index 5104bda3f..c4c77e3de 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.0 3/14/2003
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V1.4 3/14/2003
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]	      
 #
diff --git a/Shorewall/functions b/Shorewall/functions
index d056392fe..6e2fd393b 100755
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Shorewall 2.0 -- /usr/lib/shorewall/functions
+# Shorewall 1.4 -- /usr/lib/shorewall/functions
 
 #
 # Suppress all output for a command
diff --git a/Shorewall/hosts b/Shorewall/hosts
index 1b8b2f00c..cad5e062e 100644
--- a/Shorewall/hosts
+++ b/Shorewall/hosts
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 - /etc/shorewall/hosts
+# Shorewall 1.4 - /etc/shorewall/hosts
 #
 #    WARNING: 90% of Shorewall users don't need to add entries to this
 #             file and 80% of those who try to add such entries get it
diff --git a/Shorewall/icmp.def b/Shorewall/icmp.def
deleted file mode 100644
index b6b39510b..000000000
--- a/Shorewall/icmp.def
+++ /dev/null
@@ -1,6 +0,0 @@
-##############################################################################
-# Shorewall 1.3 /etc/shorewall/icmp.def
-#
-# This file is obsolete and is included for compatibility with existing
-# icmpdef extension scripts that source it.
-#
diff --git a/Shorewall/init b/Shorewall/init
index cdd21c79b..0d4564439 100644
--- a/Shorewall/init
+++ b/Shorewall/init
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.0 -- /etc/shorewall/init
+# Shorewall 1.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/Shorewall/init.sh b/Shorewall/init.sh
index 971d5aeb3..fa39f0fe3 100644
--- a/Shorewall/init.sh
+++ b/Shorewall/init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 RCDLINKS="2,S41 3,S41 6,K41"
 #
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V2.0 3/14/2003
+#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V1.4 3/14/2003
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]	      
 #
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index dde8d31e0..91f889209 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -54,7 +54,7 @@
 #        /etc/rc.d/rc.local file is modified to start the firewall.
 #
 
-VERSION=2.0.0Alpha1
+VERSION=1.4.0Alpha1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/interfaces b/Shorewall/interfaces
index 8797af3cd..3529fcfbb 100644
--- a/Shorewall/interfaces
+++ b/Shorewall/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 -- Interfaces File
+# Shorewall 1.4 -- Interfaces File
 #
 # /etc/shorewall/interfaces
 #
diff --git a/Shorewall/maclist b/Shorewall/maclist
index b49bd8765..69a3dcda2 100644
--- a/Shorewall/maclist
+++ b/Shorewall/maclist
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 - MAC list file
+# Shorewall 1.4 - MAC list file
 #
 # /etc/shorewall/maclist
 #
diff --git a/Shorewall/masq b/Shorewall/masq
index 7eb83d665..5afcc9b69 100755
--- a/Shorewall/masq
+++ b/Shorewall/masq
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 - Masquerade file
+# Shorewall 1.4 - Masquerade file
 #
 # /etc/shorewall/masq
 #
diff --git a/Shorewall/modules b/Shorewall/modules
index 0dfbe57ed..25b62c9e4 100644
--- a/Shorewall/modules
+++ b/Shorewall/modules
@@ -1,5 +1,5 @@
 ##############################################################################
-# Shorewall 2.0 /etc/shorewall/modules
+# Shorewall 1.4 /etc/shorewall/modules
 #
 # This file loads the modules needed by the firewall.
 #
diff --git a/Shorewall/nat b/Shorewall/nat
index 982d53b0d..64fa40bea 100755
--- a/Shorewall/nat
+++ b/Shorewall/nat
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.0  -- Network Address Translation Table
+# Shorewall 1.4  -- Network Address Translation Table
 #
 # /etc/shorewall/nat
 #
diff --git a/Shorewall/params b/Shorewall/params
index 8e09d2be7..24f534712 100644
--- a/Shorewall/params
+++ b/Shorewall/params
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 /etc/shorewall/params
+# Shorewall 1.4 /etc/shorewall/params
 #
 # Assign any variables that you need here.
 #
diff --git a/Shorewall/policy b/Shorewall/policy
index 556a71e8a..c90d1cdc1 100644
--- a/Shorewall/policy
+++ b/Shorewall/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 -- Policy File
+# Shorewall 1.4 -- Policy File
 #
 # /etc/shorewall/policy
 #
diff --git a/Shorewall/proxyarp b/Shorewall/proxyarp
index 0d4bb91ca..e1cd46951 100644
--- a/Shorewall/proxyarp
+++ b/Shorewall/proxyarp
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.0 -- Proxy ARP
+# Shorewall 1.4 -- Proxy ARP
 #
 # /etc/shorewall/proxyarp
 #
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 34391ddea..e6728c89b 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -3,13 +3,13 @@ This is a major release of Shorewall.
 Function from 1.3 that has been omitted from this version include:
 
 1) The MERGE_HOSTS variable in shorewall.conf is no longer
-   supported. Shorewall 2.0 behavior is the same as 1.3 with
+   supported. Shorewall 1.4 behavior is the same as 1.3 with
    MERGE_HOSTS=Yes.
 
 2. Interface names of the form <device>:<integer> in
    /etc/shorewall/interfaces now generate an error.
 
-3. Shorewall 2.0 implements behavior consistent with
+3. Shorewall 1.4 implements behavior consistent with
    OLD_PING_HANDLING=No. OLD_PING_HANDLING=Yes will generate an error
    at startup as will specification of the 'noping' or 'filterping'
    interface options.
@@ -22,10 +22,10 @@ Function from 1.3 that has been omitted from this version include:
    accepted.
 
 6. The ALLOWRELATED variable in shorewall.conf is no longer
-   supported. Shorewall 2.0 behavior is the same as 1.3 with
+   supported. Shorewall 1.4 behavior is the same as 1.3 with
    ALLOWRELATED=Yes.
 
-Changes for 2.0 include:
+Changes for 1.4 include:
 
 1. shorewall.conf has been completely reorganized into logical
    sections.
diff --git a/Shorewall/rfc1918 b/Shorewall/rfc1918
index 4e6914b86..48e96df65 100644
--- a/Shorewall/rfc1918
+++ b/Shorewall/rfc1918
@@ -1,5 +1,5 @@
 #
-# Shorewall 1.3 -- RFC1918 File
+# Shorewall 1.4 -- RFC1918 File
 #
 # /etc/shorewall/rfc1918
 #
@@ -25,7 +25,7 @@
 192.0.2.0/24		logdrop		# Example addresses
 192.168.0.0/16		logdrop		# RFC 1918
 #
-# The following are generated using the Python program found at:
+# The following are generated with the help of the Python program found at:
 #
 #	http://www.shorewall.net/pub/shorewall/contrib/iana_reserved/
 #
@@ -43,6 +43,8 @@
 39.0.0.0/8		logdrop		# Reserved
 41.0.0.0/8		logdrop		# Reserved
 42.0.0.0/8		logdrop		# Reserved
+49.0.0.0/8		logdrop		# JTC - Returned to IANA Mar 98 
+50.0.0.0/8		logdrop		# JTC - Returned to IANA Mar 98
 58.0.0.0/7		logdrop		# Reserved
 60.0.0.0/8		logdrop		# Reserved
 70.0.0.0/7		logdrop		# Reserved
@@ -53,6 +55,8 @@
 96.0.0.0/3		logdrop		# Reserved
 127.0.0.0/8		logdrop		# Loopback
 197.0.0.0/8		logdrop		# Reserved
+198.18.0.0/15		logdrop		# Reserved
+201.0.0.0/8		logdrop		# Reserved - Central & South America
 240.0.0.0/4		logdrop		# Reserved
 #
 # End of generated entries
diff --git a/Shorewall/routestopped b/Shorewall/routestopped
index 9e0b9ddc8..396a25565 100644
--- a/Shorewall/routestopped
+++ b/Shorewall/routestopped
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Shorewall 2.0 -- Hosts Accessible when the Firewall is Stopped
+# Shorewall 1.4 -- Hosts Accessible when the Firewall is Stopped
 #
 # /etc/shorewall/routestopped
 #
diff --git a/Shorewall/rules b/Shorewall/rules
index 430a5b1da..4f7936228 100755
--- a/Shorewall/rules
+++ b/Shorewall/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 2.0 - Rules File
+# Shorewall version 1.4 - Rules File
 #
 # /etc/shorewall/rules
 #
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index eedb689b2..4c23a9dbd 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#     Shorewall Packet Filtering Firewall Control Program - V2.0 - 3/14/2003
+#     Shorewall Packet Filtering Firewall Control Program - V1.4 - 3/14/2003
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]	      
 #
diff --git a/Shorewall/shorewall.conf b/Shorewall/shorewall.conf
index 450f13d5c..625b42322 100755
--- a/Shorewall/shorewall.conf
+++ b/Shorewall/shorewall.conf
@@ -1,5 +1,5 @@
 ##############################################################################
-#  /etc/shorewall/shorewall.conf V2.0 - Change the following variables to
+#  /etc/shorewall/shorewall.conf V1.4 - Change the following variables to
 #  match your setup
 #
 #  This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]         
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 5e2ec353f..dc2a17679 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 2.0.0
+%define version 1.4.0
 %define release 0Alpha1
 %define prefix /usr
 
@@ -105,7 +105,7 @@ fi
 
 %changelog
 * Thu Feb 06 2003 Tom Eastep <tom@shorewall.net>
-- Changes version to 2.0.0Alpha1
+- Changes version to 1.4.0Alpha1
 - Delete icmp.def
 - Move firewall and version to /usr/share/shorewall
 * Tue Feb 04 2003 Tom Eastep <tom@shorewall.net>
diff --git a/Shorewall/start b/Shorewall/start
index d88f1f460..5f7ee769e 100644
--- a/Shorewall/start
+++ b/Shorewall/start
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.0 -- /etc/shorewall/start
+# Shorewall 1.4 -- /etc/shorewall/start
 #
 # Add commands below that you want to be executed after shorewall has 
 # been started or restarted.
diff --git a/Shorewall/stop b/Shorewall/stop
index 78c5fa97b..6f402cfa6 100644
--- a/Shorewall/stop
+++ b/Shorewall/stop
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.0 -- /etc/shorewall/stop
+# Shorewall 1.4 -- /etc/shorewall/stop
 #
 # Add commands below that you want to be executed at the beginning of a
 # "shorewall stop" command.
diff --git a/Shorewall/stopped b/Shorewall/stopped
index 16feb827b..2b5840691 100644
--- a/Shorewall/stopped
+++ b/Shorewall/stopped
@@ -1,5 +1,5 @@
 ############################################################################
-# Shorewall 2.0 -- /etc/shorewall/stopped
+# Shorewall 1.4 -- /etc/shorewall/stopped
 #
 # Add commands below that you want to be executed at the completion of a
 # "shorewall stop" command.
diff --git a/Shorewall/tcrules b/Shorewall/tcrules
index b05224058..3d37eb2ba 100755
--- a/Shorewall/tcrules
+++ b/Shorewall/tcrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 2.0 - Traffic Control Rules File
+# Shorewall version 1.4 - Traffic Control Rules File
 #
 # /etc/shorewall/tcrules
 #
diff --git a/Shorewall/tos b/Shorewall/tos
index ff2bbb281..60245554e 100755
--- a/Shorewall/tos
+++ b/Shorewall/tos
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 -- /etc/shorewall/tos
+# Shorewall 1.4 -- /etc/shorewall/tos
 #
 #	This file defines rules for setting Type Of Service (TOS)
 #
diff --git a/Shorewall/tunnel b/Shorewall/tunnel
index db2c9b38f..25933b071 100755
--- a/Shorewall/tunnel
+++ b/Shorewall/tunnel
@@ -2,7 +2,7 @@
 
 RCDLINKS="2,S45 3,S45 6,K45"
 ################################################################################
-#   Script to create a gre or ipip tunnel -- Shorewall 2.0
+#   Script to create a gre or ipip tunnel -- Shorewall 1.4
 #
 #   Modified - Steve Cowles 5/9/2000
 #     Incorporated init {start|stop} syntax and iproute2 usage
diff --git a/Shorewall/tunnels b/Shorewall/tunnels
index e34d6dbae..93f889fa3 100644
--- a/Shorewall/tunnels
+++ b/Shorewall/tunnels
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 - /etc/shorewall/tunnels
+# Shorewall 1.4 - /etc/shorewall/tunnels
 #
 #	This file defines IPSEC, GRE, IPIP and OPENVPN tunnels.
 #
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index aacbf123b..d17eab351 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/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.0.0Alpha1
+VERSION=1.4.0Alpha1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/zones b/Shorewall/zones
index f4185bdf8..ffc23b55d 100644
--- a/Shorewall/zones
+++ b/Shorewall/zones
@@ -1,5 +1,5 @@
 #
-# Shorewall 2.0 /etc/shorewall/zones
+# Shorewall 1.4 /etc/shorewall/zones
 #
 # This file determines your network zones. Columns are:
 #