diff --git a/firewall6/setup.cgi b/firewall6/setup.cgi
index 5f1397a30..92b3a12be 100755
--- a/firewall6/setup.cgi
+++ b/firewall6/setup.cgi
@@ -106,32 +106,32 @@ if ($in{'auto'}) {
 		       'j' => [ "", 'ACCEPT' ],
 		       'cmt' => 'Accept responses to DNS queries' },
 		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmp" ] ],
-		       'p' => [ [ "", "icmp" ] ],
+		       'm' => [ [ "", "icmpv6" ] ],
+		       'p' => [ [ "", "icmpv6" ] ],
 		       'icmp-type' => [ "", "echo-reply" ],
 		       'j' => [ "", 'ACCEPT' ],
 		       'cmt' => 'Accept responses to our pings' },
 		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmp" ] ],
-		       'p' => [ [ "", "icmp" ] ],
+		       'm' => [ [ "", "icmpv6" ] ],
+		       'p' => [ [ "", "icmpv6" ] ],
 		       'icmp-type' => [ "", "destination-unreachable" ],
 		       'j' => [ "", 'ACCEPT' ],
 		       'cmt' => 'Accept notifications of unreachable hosts' },
 		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmp" ] ],
-		       'p' => [ [ "", "icmp" ] ],
+		       'm' => [ [ "", "icmpv6" ] ],
+		       'p' => [ [ "", "icmpv6" ] ],
 		       'icmp-type' => [ "", "source-quench" ],
 		       'j' => [ "", 'ACCEPT' ],
 		       'cmt' => 'Accept notifications to reduce sending speed' },
 		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmp" ] ],
-		       'p' => [ [ "", "icmp" ] ],
+		       'm' => [ [ "", "icmpv6" ] ],
+		       'p' => [ [ "", "icmpv6" ] ],
 		       'icmp-type' => [ "", "time-exceeded" ],
 		       'j' => [ "", 'ACCEPT' ],
 		       'cmt' => 'Accept notifications of lost packets' },
 		     { 'chain' => 'INPUT',
-		       'm' => [ [ "", "icmp" ] ],
-		       'p' => [ [ "", "icmp" ] ],
+		       'm' => [ [ "", "icmpv6" ] ],
+		       'p' => [ [ "", "icmpv6" ] ],
 		       'icmp-type' => [ "", "parameter-problem" ],
 		       'j' => [ "", 'ACCEPT' ],
 		       'cmt' => 'Accept notifications of protocol problems' }
@@ -157,8 +157,8 @@ if ($in{'auto'}) {
 			# Allow pings
 			push(@{$table->{'rules'}},
 			     { 'chain' => 'INPUT',
-			       'm' => [ [ "", "icmp" ] ],
-			       'p' => [ [ "", "icmp" ] ],
+			       'm' => [ [ "", "icmpv6" ] ],
+			       'p' => [ [ "", "icmpv6" ] ],
 			       'icmp-type' => [ "", "echo-request" ],
 			       'j' => [ "", 'ACCEPT' ],
 			       'cmt' => 'Respond to pings' }, );