diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index e7bb3f919..ac186e32d 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -6,6 +6,10 @@ Changes in 3.2.0 Beta 6
 
 3)  Add TOS column to tcrules.
 
+4)  Fix 'proxyarp' interface attribute handling.
+
+5)  Fix default route generation in providers handling.
+
 Changes in 3.2.0 Beta 5
 
 1)  Fix compilation problem on LEAF Bering.
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 3d10af50c..39481297a 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -1260,7 +1260,11 @@ __EOF__
 		    ;;
 		balance)
 		    balance=yes
-		    save_command "DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight 1\""
+		    if [ "x$gateway" = xdetect ] ; then
+			save_command "DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight 1\""
+		    else
+			save_command "DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight 1\""
+		    fi
 		    ;;
 		loose)
 		    loose=Yes
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 4ea951347..549b4cead 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -40,6 +40,12 @@ Problems Corrected in 3.2.0 Beta 6
 
     even when the -e option had not been specified.
 
+3)  Previously, the 'proxyarp' option in /etc/shorewall/interfaces caused
+    startup errors.
+
+4)  Previously, specifying specific IP addresses for GATEWAY in with 'balance'
+    /etc/shorewall/providers caused a [re]start error.
+
 Other changes in 3.2.0 Beta 6
 
 1)  A TOS column has been added to /etc/shorewall/tcrules. This allows marking