diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh
index 72f88e6e5..22705440b 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index 4f2354271..fb2534a08 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec
index e5523da77..691fb23b2 100644
--- a/Shorewall-common/shorewall-common.spec
+++ b/Shorewall-common/shorewall-common.spec
@@ -1,13 +1,11 @@
 %define name shorewall-common
 %define version 4.0.0
-%define release 0RC2
-%define prefix /usr
+%define release 1
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Prefix: %{prefix}
 License: GPL
 Packager: Tom Eastep <teastep@shorewall.net>
 Group: Networking/Utilities
@@ -234,6 +232,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
+* Wed Jul 11 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-1
 * Sun Jul 08 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0RC2
 * Fri Jun 29 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh
index 472dd15e2..2725f3b2e 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh
index fb22da249..b15bc4258 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 9eb45e748..5c5c228bc 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 53483bd37..776209621 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 0RC2
+%define release 1
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -98,6 +98,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Wed Jul 11 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-1
 * Sun Jul 08 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0RC2
 * Mon Jul 02 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index a175cddf0..19b67a77f 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index a0930428b..2e9309a43 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -130,7 +130,7 @@ sub initialize() {
 		    ORIGINAL_POLICY_MATCH => '',
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
-		    VERSION =>  '4.0.0-RC2',
+		    VERSION =>  '4.0.0',
 		    CAPVERSION => 30405 ,
 		  );
     #
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index fac68a545..3752fffc5 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh
index 2c7129171..bad3d63ff 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-RC2
+VERSION=4.0.0
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec
index 30957aa51..43a70aaca 100644
--- a/Shorewall-shell/shorewall-shell.spec
+++ b/Shorewall-shell/shorewall-shell.spec
@@ -81,6 +81,9 @@ fi
 %doc COPYING INSTALL 
 
 %changelog
+* Wed Jul 11 2007 Tom Eastep tom@shorewall.net
+- Modify shorewall.conf on uninstall
+- Updated to 4.0.0-1
 * Sun Jul 08 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.0.0-0RC2
 * Fri Jun 29 2007 Tom EAstep tom@shorewall.net