diff --git a/Lrp2/usr/share/shorewall/action.AllowTrcrt b/Lrp2/usr/share/shorewall/action.AllowTrcrt
index 04a792539..1b6180003 100644
--- a/Lrp2/usr/share/shorewall/action.AllowTrcrt
+++ b/Lrp2/usr/share/shorewall/action.AllowTrcrt
@@ -1,11 +1,11 @@
 #
 # Shorewall 2.0 /etc/shorewall/action.AllowTrcrt
 #
-#	This action accepts Traceroute (for up to 20 hops):
+#	This action accepts Traceroute (for up to 30 hops):
 #
 ######################################################################################
 #TARGET  SOURCE		DEST      	PROTO	DEST    SOURCE	 	RATE	USER/
 #                       	        	PORT    PORT(S)		LIMIT	GROUP
-ACCEPT	 -	        -               udp	33434:33454 #UDP Traceroute
+ACCEPT	 -	        -               udp	33434:33524 #UDP Traceroute
 ACCEPT	 -		-		icmp	8	    #ICMP Traceroute
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Lrp2/usr/share/shorewall/firewall b/Lrp2/usr/share/shorewall/firewall
index 96cb42329..2685ed83e 100755
--- a/Lrp2/usr/share/shorewall/firewall
+++ b/Lrp2/usr/share/shorewall/firewall
@@ -1860,7 +1860,7 @@ setup_syn_flood_chain ()
     run_iptables -N $chain
     run_iptables -A $chain -m limit --limit $limit $limit_burst -j RETURN
     [ -n "$3" ] && \
-	log_rule_limit $3 $chain $chain DROP "-m limit --limit 5/min --limit-burst 5" "" ""
+	log_rule_limit $3 $chain DROP "-m limit --limit 5/min --limit-burst 5" ""
     run_iptables -A $chain -j DROP
 }
 
diff --git a/Lrp2/usr/share/shorewall/version b/Lrp2/usr/share/shorewall/version
index 3d45b5c65..b8061b50d 100644
--- a/Lrp2/usr/share/shorewall/version
+++ b/Lrp2/usr/share/shorewall/version
@@ -1 +1 @@
-2.0.14
+2.0.15
diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 7f319dba7..81c2f0fdb 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -113,3 +113,5 @@ Changes in 2.0.14
 Changes in 2.0.15
 
 1)  Increased port range for Traceroute.
+
+2)  Corrected port of rate-limit logging change.
diff --git a/STABLE2/fallback.sh b/STABLE2/fallback.sh
index aab9770a0..f1c46352c 100755
--- a/STABLE2/fallback.sh
+++ b/STABLE2/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=2.0.14
+VERSION=2.0.15
 
 usage() # $1 = exit status
 {
diff --git a/STABLE2/firewall b/STABLE2/firewall
index 96cb42329..2685ed83e 100755
--- a/STABLE2/firewall
+++ b/STABLE2/firewall
@@ -1860,7 +1860,7 @@ setup_syn_flood_chain ()
     run_iptables -N $chain
     run_iptables -A $chain -m limit --limit $limit $limit_burst -j RETURN
     [ -n "$3" ] && \
-	log_rule_limit $3 $chain $chain DROP "-m limit --limit 5/min --limit-burst 5" "" ""
+	log_rule_limit $3 $chain DROP "-m limit --limit 5/min --limit-burst 5" ""
     run_iptables -A $chain -j DROP
 }
 
diff --git a/STABLE2/install.sh b/STABLE2/install.sh
index 841c8205b..30e0cf524 100755
--- a/STABLE2/install.sh
+++ b/STABLE2/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=2.0.14
+VERSION=2.0.15
 
 usage() # $1 = exit status
 {
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index fa03d9320..9c1e2b717 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -269,3 +269,10 @@ Problems corrected in 2.0.15
 
 1)  The range of ports opened by the AllowTrcrt action has been
     expanded to 33434:33524.
+
+2)  Code mis-ported from 2.2.0 caused the following error during
+    "shorewall start" where SYN rate-limiting is present in
+    /etc/shorewall/policy:
+
+      Bad argument `DROP'
+      Try `iptables -h' or 'iptables --help' for more information.
diff --git a/STABLE2/shorewall.spec b/STABLE2/shorewall.spec
index 06a6e7e61..35e86f744 100644
--- a/STABLE2/shorewall.spec
+++ b/STABLE2/shorewall.spec
@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 2.0.14
+%define version 2.0.15
 %define release 1
 %define prefix /usr
 
@@ -141,6 +141,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Wed Jan 12 2005 Tom Eastep tom@shorewall.net
+- Updated to 2.0.15-1
 * Mon Jan 03 2005 Tom Eastep tom@shorewall.net
 - Updated to 2.0.14-1
 * Thu Dec 02 2004 Tom Eastep tom@shorewall.net
diff --git a/STABLE2/uninstall.sh b/STABLE2/uninstall.sh
index 80954b16e..7c2cbe080 100755
--- a/STABLE2/uninstall.sh
+++ b/STABLE2/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Seattle Firewall
 
-VERSION=2.0.14
+VERSION=2.0.15
 
 usage() # $1 = exit status
 {