diff --git a/src/regexp/syntax/make_perl_groups.pl b/src/regexp/syntax/make_perl_groups.pl
index 80a2c9a..fafa41c 100755
--- a/src/regexp/syntax/make_perl_groups.pl
+++ b/src/regexp/syntax/make_perl_groups.pl
@@ -11,7 +11,10 @@
 # Perl about each letter from 0-128 and write down
 # its answer.
 
-@posixclasses = (
+use strict;
+use warnings;
+
+my @posixclasses = (
 	"[:alnum:]",
 	"[:alpha:]",
 	"[:ascii:]",
@@ -28,13 +31,13 @@
 	"[:xdigit:]",
 );
 
-@perlclasses = (
+my @perlclasses = (
 	"\\d",
 	"\\s",
 	"\\w",
 );
 
-%overrides = (
+my %overrides = (
 	# Prior to Perl 5.18, \s did not match vertical tab.
 	# RE2 preserves that original behaviour.
 	"\\s:11" => 0,
@@ -70,7 +73,7 @@
   }
   print "}\n\n";
   my $n = @ranges;
-  $negname = $name;
+  my $negname = $name;
   if ($negname =~ /:/) {
     $negname =~ s/:/:^/;
   } else {
@@ -97,13 +100,25 @@
   my $count = @entries;
 }
 
+# Prepare gofmt command
+my $gofmt;
+
+if (@ARGV > 0 && $ARGV[0] =~ /\.go$/) {
+  # Send the output of gofmt to the given file
+  open($gofmt, '|-', 'gofmt >'.$ARGV[0]) or die;
+} else {
+  open($gofmt, '|-', 'gofmt') or die;
+}
+
+# Redirect STDOUT to gofmt input
+select $gofmt;
+
 print <<EOF;
 // Copyright 2013 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// GENERATED BY make_perl_groups.pl; DO NOT EDIT.
-// make_perl_groups.pl >perl_groups.go
+// Code generated by make_perl_groups.pl; DO NOT EDIT.
 
 package syntax
 
diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
index 8f16f63..2624290 100644
--- a/src/regexp/syntax/parse.go
+++ b/src/regexp/syntax/parse.go
@@ -1576,6 +1576,8 @@
 	class []rune
 }
 
+//go:generate perl make_perl_groups.pl perl_groups.go
+
 // parsePerlClassEscape parses a leading Perl character class escape like \d
 // from the beginning of s. If one is present, it appends the characters to r
 // and returns the new slice r and the remainder of the string.
diff --git a/src/regexp/syntax/perl_groups.go b/src/regexp/syntax/perl_groups.go
index effe4e6..675466e 100644
--- a/src/regexp/syntax/perl_groups.go
+++ b/src/regexp/syntax/perl_groups.go
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// GENERATED BY make_perl_groups.pl; DO NOT EDIT.
-// make_perl_groups.pl >perl_groups.go
+// Code generated by make_perl_groups.pl; DO NOT EDIT.
 
 package syntax