diff --git a/Shorewall/Perl/Shorewall/IPAddrs.pm b/Shorewall/Perl/Shorewall/IPAddrs.pm
index 15d4744fa..2ca17dbdf 100644
--- a/Shorewall/Perl/Shorewall/IPAddrs.pm
+++ b/Shorewall/Perl/Shorewall/IPAddrs.pm
@@ -548,6 +548,8 @@ sub normalize_6addr( $ ) {
     }
 
     $addr =~ s/::/:0:/;
+    $addr =~ s/:0+/:0/g;
+    $addr =~ s/^0+:/0:/;
 
     $addr;
 }
@@ -573,7 +575,7 @@ sub validate_6range( $$ ) {
 }
 
 sub validate_6host( $$ ) {
-    my ( $host, $allow_name )  = $_[0];
+    my ( $host, $allow_name )  = @_;
 
     if ( $host =~ /^(.*:.*)-(.*:.*)$/ ) {
 	validate_6range $1, $2;