diff --git a/firewall6/setup.cgi b/firewall6/setup.cgi
index d76f8d3c0..94609e264 100755
--- a/firewall6/setup.cgi
+++ b/firewall6/setup.cgi
@@ -108,33 +108,8 @@ if ($in{'auto'}) {
 		     { 'chain' => 'INPUT',
 		       'm' => [ [ "", "icmpv6" ] ],
 		       'p' => [ [ "", "icmpv6" ] ],
-		       'icmpv6-type' => [ "", "echo-reply" ],
 		       'j' => [ "", 'ACCEPT' ],
-		       'cmt' => 'Accept responses to our pings' },
-		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmpv6" ] ],
-		       'p' => [ [ "", "icmpv6" ] ],
-		       'icmpv6-type' => [ "", "destination-unreachable" ],
-		       'j' => [ "", 'ACCEPT' ],
-		       'cmt' => 'Accept notifications of unreachable hosts' },
-		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmpv6" ] ],
-		       'p' => [ [ "", "icmpv6" ] ],
-		       'icmpv6-type' => [ "", "packet-too-big" ],
-		       'j' => [ "", 'ACCEPT' ],
-		       'cmt' => 'Accept notifications to reduce sending speed' },
-		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmpv6" ] ],
-		       'p' => [ [ "", "icmpv6" ] ],
-		       'icmpv6-type' => [ "", "time-exceeded" ],
-		       'j' => [ "", 'ACCEPT' ],
-		       'cmt' => 'Accept notifications of lost packets' },
-		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmpv6" ] ],
-		       'p' => [ [ "", "icmpv6" ] ],
-		       'icmpv6-type' => [ "", "parameter-problem" ],
-		       'j' => [ "", 'ACCEPT' ],
-		       'cmt' => 'Accept notifications of protocol problems' }
+		       'cmt' => 'Accept all ICMPv6 traffic' },
 			);
 		if ($in{'auto'} >= 3) {
 			# Allow ssh and ident