diff --git a/Lrp/sbin/shorewall b/Lrp/sbin/shorewall
index d0d9ca1a2..01abe9a8c 100755
--- a/Lrp/sbin/shorewall
+++ b/Lrp/sbin/shorewall
@@ -195,7 +195,7 @@ get_config() {
 #
 display_chains()
 {
-    trap "rm -f /tmp/chains-$$; exit 1" 1 2 3 4 5 6 9
+    trap "rm -f $tmpfile; exit 1" 1 2 3 4 5 6 9
 
     if [ "$haveawk" = "Yes" ]; then
 	#
diff --git a/Lrp/usr/share/shorewall/action.AllowPCA b/Lrp/usr/share/shorewall/action.AllowPCA
index bda0e4a1f..2afc22987 100644
--- a/Lrp/usr/share/shorewall/action.AllowPCA
+++ b/Lrp/usr/share/shorewall/action.AllowPCA
@@ -6,6 +6,6 @@
 ######################################################################################
 #TARGET  SOURCE		DEST      	PROTO	DEST    SOURCE	 	RATE	USER/
 #                       	        	PORT    PORT(S)		LIMIT	GROUP
-ACCEPT	 -		-		udp	5631
-ACCEPT	 -		-		tcp	5632
+ACCEPT	 -		-		udp	5632
+ACCEPT	 -		-		tcp	5631
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Lrp/usr/share/shorewall/firewall b/Lrp/usr/share/shorewall/firewall
index ae564c8f4..b7d4ad47d 100755
--- a/Lrp/usr/share/shorewall/firewall
+++ b/Lrp/usr/share/shorewall/firewall
@@ -2938,7 +2938,7 @@ process_actions2() {
 		[ "$COMMAND" != check ] && run_iptables -A dropNotSyn -p tcp ! --syn -j DROP
 		;;
 	    rejNotSyn)
-		[ "$COMMAND" != check ] && run_iptables -A rejectNotSyn -p tcp ! --syn -j REJECT --reject-with tcp-reset
+		[ "$COMMAND" != check ] && run_iptables -A rejNotSyn -p tcp ! --syn -j REJECT --reject-with tcp-reset
 		;;
 	    logNotSyn)
 		log_action logNotSyn LOG
@@ -5323,7 +5323,7 @@ activate_rules()
 	shift
 
 	if havenatchain $destchain ; then
-	    run_iptables -t nat -A $sourcechain $@ -j $destchain
+	    run_iptables2 -t nat -A $sourcechain $@ -j $destchain
 	elif [ -n "$BRIDGING" -a -f $TMP_DIR/physdev ]; then
 	    rm -f #TMP_DIR/physdev
 	fi
@@ -5340,7 +5340,7 @@ activate_rules()
 	shift
 
 	if havenatchain $destchain; then
-	    eval run_iptables -t nat -I $sourcechain \
+	    eval run_iptables2 -t nat -I $sourcechain \
 		\$${sourcechain}_rule $@ -j $destchain
 	    eval ${sourcechain}_rule=\$\(\(\$${sourcechain}_rule + 1\)\)
 	elif [ -n "$BRIDGING" -a -f $TMP_DIR/physdev ]; then
@@ -5393,7 +5393,7 @@ activate_rules()
 	    interface=${host%%:*}
 	    networks=${host#*:}
 
-	    run_iptables -A OUTPUT -o $interface $(match_dest_hosts $networks) -j $chain1
+	    run_iptables2 -A OUTPUT -o $interface $(match_dest_hosts $networks) -j $chain1
 
 	    #
 	    # Add jumps from the builtin chains for DNAT and SNAT rules
@@ -5401,10 +5401,10 @@ activate_rules()
 	    addrulejump PREROUTING  $(dnat_chain $zone) -i $interface $(match_source_hosts $networks)
 	    addrulejump POSTROUTING $(snat_chain $zone) -o $interface $(match_dest_hosts $networks)
 
-	    run_iptables -A $(input_chain $interface) $(match_source_hosts $networks) -j $chain2
+	    run_iptables2 -A $(input_chain $interface) $(match_source_hosts $networks) -j $chain2
 
 	    [ -n "$complex" ] && \
-		run_iptables -A $(forward_chain $interface) $(match_source_hosts $networks) -j $frwd_chain
+		run_iptables2 -A $(forward_chain $interface) $(match_source_hosts $networks) -j $frwd_chain
 
 	    case $networks in
 		*.*.*.*)
@@ -5469,7 +5469,7 @@ activate_rules()
 		    # routeback was specified for this host group
 		    #
 		    if [ $zone != $zone1 -o $num_ifaces -gt 1 ] || list_search $host1 $routeback ; then
-			run_iptables -A $frwd_chain -o $interface1 $(match_dest_hosts $networks1) -j $chain			
+			run_iptables2 -A $frwd_chain -o $interface1 $(match_dest_hosts $networks1) -j $chain			
 		    fi
 		done
 	    else
@@ -5484,7 +5484,7 @@ activate_rules()
 			networks1=${host1#*:}
 
 			if [ "$host" != "$host1" ] || list_search $host $routeback; then
-			    run_iptables -A $chain1 $(match_source_hosts $networks) -o $interface1 $(match_dest_hosts $networks1) -j $chain
+			    run_iptables2 -A $chain1 $(match_source_hosts $networks) -o $interface1 $(match_dest_hosts $networks1) -j $chain
 			fi
 		    done
 		done
diff --git a/Lrp/usr/share/shorewall/version b/Lrp/usr/share/shorewall/version
index a14da2902..a6e7bcb30 100644
--- a/Lrp/usr/share/shorewall/version
+++ b/Lrp/usr/share/shorewall/version
@@ -1 +1 @@
-2.0.16
+2.0.17
diff --git a/Lrp/var/lib/lrpkg/shorwall.version b/Lrp/var/lib/lrpkg/shorwall.version
index a14da2902..a6e7bcb30 100644
--- a/Lrp/var/lib/lrpkg/shorwall.version
+++ b/Lrp/var/lib/lrpkg/shorwall.version
@@ -1 +1 @@
-2.0.16
+2.0.17