diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 6fcaba542..289f4a887 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -1,3 +1,7 @@
-Changes since 2.0.3c
+Changes in 2.0.4
 
 1) Fix DNAT logging with 'fw' as the source zone.
+
+Change in 2.0.5
+
+2) Eradicate more RESTOREBASE messages.
diff --git a/STABLE2/firewall b/STABLE2/firewall
index 41dc667f1..fee1eb195 100755
--- a/STABLE2/firewall
+++ b/STABLE2/firewall
@@ -1229,6 +1229,21 @@ disable_ipv6() {
     fi
 }
 
+disable_ipv6_1() {
+    local foo=$(ip -f inet6 addr ls 2> /dev/null)
+
+    if [ -n "$foo" ]; then
+	if qt which ip6tables; then
+	    progress_message "Disabling IPV6..."
+	    ip6tables -P FORWARD DROP
+	    ip6tables -P INPUT DROP
+	    ip6tables -P OUTPUT DROP
+	else
+	    error_message "WARNING: DISABLE_IPV6=Yes in shorewall.conf but this system does not appear to have ip6tables"
+	fi
+    fi
+}
+
 #
 # Stop the Firewall
 #
@@ -1280,7 +1295,7 @@ stop_firewall() {
     delete_proxy_arp
     [ -n "$CLEAR_TC" ] && delete_tc1
 
-    [ -n "$DISABLE_IPV6" ] && disable_ipv6
+    [ -n "$DISABLE_IPV6" ] && disable_ipv6_1
 
     if [ -z "$ADMINISABSENTMINDED" ]; then
 	for chain in INPUT OUTPUT FORWARD; do
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index cd89516ec..63c29616d 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -1,10 +1,17 @@
-Shorewall 2.0.4
+Shorewall 2.0.5
 
 ----------------------------------------------------------------------
-Problems Corrected since 2.0.3c
+Problems Corrected in version 2.0.4
 
 1)  A DNAT rule with 'fw' as the source that specified logging caused
     "shorewall start" to fail.
 
+----------------------------------------------------------------------
+Problems Corrected in version 2.0.5
+
+1) Eliminated "$RESTOREBASE: ambiguous redirect" messages during 
+   "shorewll stop" in the case where DISABLE_IPV6=Yes in 
+   shorewall.conf.
+