diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 666c63b2d..7c1d31154 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -38,3 +38,11 @@ Changes since 2.0.0
 18) Make 'routeback' on hosts work again.
 
 19) Fix display of ICMP packets.
+
+20) Fix init.debian.sh
+
+21) Eliminate meaningless warning out of proxyarp processing.
+
+22) Fix module loading on Mandrake.
+
+23) Eliminate confusing IPV6 warnings.
\ No newline at end of file
diff --git a/STABLE2/firewall b/STABLE2/firewall
index 11113945c..19b41232b 100755
--- a/STABLE2/firewall
+++ b/STABLE2/firewall
@@ -1126,12 +1126,16 @@ setup_forwarding() {
 # Disable IPV6
 #
 disable_ipv6() {
-    if qt which ip6tables; then
-	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"
+    local foo=$(ip -f inet6 addr ls 2> /dev/null)
+
+    if [ -n "$foo" ]; then
+	if qt which ip6tables; then
+	    ip6tables -P FORWARD DROP && save_command ip6tables -P FORWARD DROP
+	    ip6tables -P INPUT DROP   && save_command ip6tables -P INPUT DROP
+	    ip6tables -P OUTPUT DROP  && save_command 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
 }
 
@@ -3720,6 +3724,11 @@ loadmodule() # $1 = module name, $2 - * arguments
     local modulename=$1
     local modulefile
     local suffix
+    moduleloader=modprobe
+
+    if ! qt which modprobe; then 
+	moduleloader=insmod
+    fi
 
     if [ -z "$(lsmod | grep $modulename)" ]; then
 	shift
@@ -3728,7 +3737,15 @@ loadmodule() # $1 = module name, $2 - * arguments
 	    modulefile=$MODULESDIR/${modulename}.${suffix}
 
 	    if [ -f $modulefile ]; then
-		insmod $modulefile $*
+		case $moduleloader in
+		    insmod)
+			insmod $modulefile $*
+			;;
+		    *)
+			modprobe $modulename
+			;;
+		esac
+
 		return
 	    fi
 	done
@@ -5924,7 +5941,7 @@ do_initialize() {
     BLACKLISTNEWONLY=$(added_param_value_no BLACKLISTNEWONLY $BLACKLISTNEWONLY)
     DISABLE_IPV6=$(added_param_value_no DISABLE_IPV6 $DISABLE_IPV6)
     BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
-    [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz"
+    [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz"
 
     #
     # Strip the files that we use often
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index cc2f9bee0..573b07605 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -16,6 +16,14 @@ Problems Corrected since 2.0.0
 4) The "shorewall show log" and "shorewall logwatch" commands
    incorrectly displayed type 3 ICMP packets.
 
+5) On Debian systems, an install using the tarball results in an
+   inability to start Shorewall at system boot.
+
+6) Confusing warning messages regarding IPV6 occur during startup.
+
+7) Modules listed in /etc/shorewall/modules don't load on Mandrake
+   10.0 final.
+
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: