diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 6989615a2..a7a77c0fc 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -89,7 +89,7 @@ our %capabilities;
 #
 # /etc/protocols and /etc/services
 #
-# Protocol and Services tables generated using buildproto.pl - Wed Jun 19 21:05:31 2007
+# Protocol and Services tables generated using buildproto.pl - Wed Jun 20 12:47:57 2007
 #
 our %protocols = (
 		  ip			=> 0,
@@ -181,7 +181,7 @@ our %protocols = (
 		  SCTP			=> 132,
 		  fc			=> 133,
 		  FC			=> 133,
-		  );
+		 );
 
 our %services  = (
 		  tcpmux		=> 1,
@@ -570,7 +570,7 @@ our %services  = (
 		  dircproxy		=> 57000,
 		  tfido			=> 60177,
 		  fido			=> 60179,
-		  );
+		 );
 #
 # Capabilities
 #
diff --git a/Shorewall-perl/buildproto.pl b/Shorewall-perl/buildproto.pl
index f973c536f..0af70c0ec 100644
--- a/Shorewall-perl/buildproto.pl
+++ b/Shorewall-perl/buildproto.pl
@@ -58,7 +58,7 @@ sub print_service( $$ ) {
     }
 }
 
-set_shorewall_dir($ARGV[0] ? $ARGV[0] : '/etc');
+set_shorewall_dir($ARGV[0] || '/etc');
 
 ensure_config_path;
 
@@ -68,10 +68,9 @@ print <<"EOF";
 #
 # Protocol and Services tables generated using buildproto.pl - $date
 #
+our %protocols = (
 EOF
 
-print "our %protocols = (\n";
-
 open_file 'protocols' or fatal_error "Cannot open protocols: $!";
 
 while ( read_a_line1 ) {
@@ -81,7 +80,7 @@ while ( read_a_line1 ) {
     print_it( $proto2, $number ) unless $proto2 eq '-' || $proto3 ne '-';
 }
 
-print "\t\t  );\n\n";
+print "\t\t );\n\n";
 
 print "our %services  = (\n";
 
@@ -99,4 +98,4 @@ while ( read_a_line1 ) {
     }
 }
 
-print "\t\t  );\n";
+print "\t\t );\n";