diff --git a/firewall/firewall4-lib.pl b/firewall/firewall4-lib.pl
index d90a6468f..c4becc425 100755
--- a/firewall/firewall4-lib.pl
+++ b/firewall/firewall4-lib.pl
@@ -44,6 +44,14 @@ else {
 		 '--physdev-in',
 		 '--physdev-out');
 
+@ipvx_rtypes = ( "icmp-net-unreachable", "icmp-host-unreachable",
+		  "icmp-port-unreachable", "icmp-proto-unreachable",
+		  "icmp-net-prohibited", "icmp-host-prohibited",
+		  "echo-reply", "tcp-reset" );
+
+$ipvx_todestpattern='^([0-9\.]+)(\-([0-9\.]+))?(:(\d+)(\-(\d+))?)?$';
+
+
 # set IP Version
 &set_ipvx_version('ipv4');
 
diff --git a/firewall/firewall6-lib.pl b/firewall/firewall6-lib.pl
index 775e30d5d..188e20f99 100755
--- a/firewall/firewall6-lib.pl
+++ b/firewall/firewall6-lib.pl
@@ -44,6 +44,12 @@ else {
 		 '--physdev-in',
 		 '--physdev-out');
 
+@ipvx_rtypes = ( "icmp6-no-route", "icmp6-adm-prohibited",
+		  "icmp6-addr-unreachable", "icmp6-port-unreachable",
+		  "echo-reply", "tcp-reset" );
+
+$ipvx_todestpattern='^\[([0-9A-Fa-f:]+)](\-([0-9A-Fa-f:]+))?(:(\d+)(\-(\d+))?)?$';
+
 # set IP Version
 &set_ipvx_version('ipv6');