diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index ca8f7f168..1c9d65460 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -1,3 +1,7 @@
+Changes in 4.0.0 RC 1
+
+1)  shorewall-perl RPM no longer installable under shorewall 3.4.
+
 Changes in 4.0.0 Beta 6
 
 1)  First step to adding compiler debugging facility.
diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh
index 012b0f1db..487cdefa7 100755
--- a/Shorewall-common/fallback.sh
+++ b/Shorewall-common/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index 70663b825..e27cb0557 100755
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 20cf50f64..9353cd093 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 4.0.0 Beta 7
+Shorewall 4.0.0 RC 1
 ----------------------------------------------------------------------------
                    R E L E A S E  H I G H L I G H T S
 ----------------------------------------------------------------------------
@@ -23,40 +23,12 @@ packages (you may install them both).
 
 Problems corrected in 4.0.0 Beta 7.
 
-1)  Installation of Shorewall-perl when Shorewall is not yet installs
-    no longer suffers a failure in the generation of
-    /usr/share/shorewall-perl/Shorewall/Ports.pm.
+None.
 
-Other changes in Shorewall 4.0.0 Beta 7
-
-1)                      I M P O R T A N T
-    
-    The name of the Shorewall package has been changed to
-    Shorewall-common. This change, along with changes to the RPM .spec
-    files will allow for automatic upgrade from Shorewall 3.x to
-    Shorewall 4.x on RPM-based distributions such as SuSE, RedHat and
-    CentOS.
-
-    Except for the name change, the Shorewall-common package is the
-    same as the Shorewall package.
-
-2)  When an /sbin/shorewall command that begins with 'debug' or 'trace'
-    invokes the Shorewall-perl compiler, the compiler will include
-    additional debugging information in its warning and error
-    messages. This additional information is intended to help the
-    people supporting Shorewall to diagnose the cause of the message.
-
-3)  The script generated by Shorewall-perl now assumes that
-    iptables-restore and iptables-save are in the same directory as the
-    program specified in the IPTABLES setting in Shorewall-conf.
-
-    If IPTABLES is not specified, then the iptables utility is located
-    using the PATH setting and the iptables-restore and iptables-save
-    programs from the same directory are used.
-
-4)  COMMENTs are now allowed in the accounting file under
-    Shorewall-perl
+Other changes in Shorewall 4.0.0 RC 1.
 
+1)  The shorewall-perl RPM may no longer be installed under Shorewall
+    3.4. It requires shorewall_common.
 
 Migration Considerations:
 
diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec
index f7788997b..d57a5109b 100644
--- a/Shorewall-common/shorewall-common.spec
+++ b/Shorewall-common/shorewall-common.spec
@@ -1,6 +1,6 @@
 %define name shorewall-common
 %define version 4.0.0
-%define release 0Beta7
+%define release 0RC1
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -253,6 +253,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
+* Fri Jun 29 2007 Tom EAstep tom@shorewall.net
+- Updated to 4.0.0-0RC1
 * Sun Jun 24 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh
index ab9b3c2d7..d8ae0f971 100755
--- a/Shorewall-common/uninstall.sh
+++ b/Shorewall-common/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh
index 2b5af8c1a..55d7de457 100755
--- a/Shorewall-lite/fallback.sh
+++ b/Shorewall-lite/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 80db89932..6b0a56728 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 126c5d185..9c6141d30 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,6 +1,6 @@
 %define name shorewall-lite
 %define version 4.0.0
-%define release 0Beta7
+%define release 0RC1
 %define prefix /usr
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 565e442a8..f85afee14 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 2aaaef232..6ae09479f 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -127,7 +127,7 @@ sub initialize() {
 		    ORIGINAL_POLICY_MATCH => '',
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
-		    VERSION =>  '4.0.0-Beta7',
+		    VERSION =>  '4.0.0-RC1',
 		    CAPVERSION => 30405 ,
 		  );
     #
diff --git a/Shorewall-perl/Shorewall/FallbackPorts.pm b/Shorewall-perl/Shorewall/FallbackPorts.pm
index 2a230ef63..4b8aeacb5 100644
--- a/Shorewall-perl/Shorewall/FallbackPorts.pm
+++ b/Shorewall-perl/Shorewall/FallbackPorts.pm
@@ -23,7 +23,7 @@
 # This module exports the %protocols and %services hashes built from 
 # /etc/protocols and /etc/services respectively.
 #
-# Module generated using buildports.pl 4.0.0-Beta6 - Thu Jun 21 10:52:52 2007
+# Module generated using buildports.pl 4.0.0-Beta7 - Fri Jun 29 14:10:45 2007
 #
 package Shorewall::Ports;
 
@@ -97,6 +97,8 @@ our %protocols = (
 		  'ipv6-opts'		=> 60,
 		  'IPv6-Opts'		=> 60,
 		  rspf			=> 73,
+		  RSPF			=> 73,
+		  CPHB			=> 73,
 		  vmtp			=> 81,
 		  VMTP			=> 81,
 		  eigrp			=> 88,
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index c6ad2bd92..3c8d8a1f4 100755
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index 27c0664a1..c12d93fcd 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -1,6 +1,6 @@
 %define name shorewall-perl
 %define version 4.0.0
-%define release 0Beta7
+%define release 0RC1
 %define prefix /usr
 
 Summary: Shoreline Firewall Perl-based compiler.
@@ -92,6 +92,8 @@ fi
 %doc COPYING releasenotes.txt
 
 %changelog
+* Fri Jun 29 2007 Tom EAstep tom@shorewall.net
+- Updated to 4.0.0-0RC1
 * Sun Jun 24 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh
index e2d465e4d..0eefef8f1 100755
--- a/Shorewall-shell/install.sh
+++ b/Shorewall-shell/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=4.0.0-Beta7
+VERSION=4.0.0-RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec
index 25a1094c9..39a4863d8 100644
--- a/Shorewall-shell/shorewall-shell.spec
+++ b/Shorewall-shell/shorewall-shell.spec
@@ -1,6 +1,6 @@
 %define name shorewall-shell
 %define version 4.0.0
-%define release 0Beta7
+%define release 0RC1
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -66,6 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING INSTALL 
 
 %changelog
+* Fri Jun 29 2007 Tom EAstep tom@shorewall.net
+- Updated to 4.0.0-0RC1
 * Sun Jun 24 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0Beta7
 * Wed Jun 20 2007 Tom Eastep tom@shorewall.net