diff --git a/src/pkg/syscall/PORT b/src/pkg/syscall/PORT.sh
similarity index 87%
rename from src/pkg/syscall/PORT
rename to src/pkg/syscall/PORT.sh
index 2eb05920c40..e7121c45bf2 100755
--- a/src/pkg/syscall/PORT
+++ b/src/pkg/syscall/PORT.sh
@@ -62,13 +62,13 @@
 # * zerror_${GOOS}_${GOARCH}.go
 #
 # This machine-generated file defines the system's error numbers,
-# error strings, and signal numbers.  The generator is "mkerrors".
-# Usually no arguments are needed, but mkerrors will pass its
+# error strings, and signal numbers.  The generator is "mkerrors.sh".
+# Usually no arguments are needed, but mkerrors.sh will pass its
 # arguments on to godefs.
 #
 # * zsyscall_${GOOS}_${GOARCH}.go
 #
-# Generated by mksyscall; see syscall_${GOOS}.go above.
+# Generated by mksyscall.sh; see syscall_${GOOS}.go above.
 #
 # * zsysnum_${GOOS}_${GOARCH}.go
 #
@@ -81,8 +81,8 @@
 GOOSARCH="${GOOS}_${GOARCH}"
 
 # defaults
-mksyscall="mksyscall"
-mkerrors="mkerrors"
+mksyscall="mksyscall.sh"
+mkerrors="mkerrors.sh"
 
 case "$GOOSARCH" in
 _* | *_ | _)
@@ -90,22 +90,22 @@ _* | *_ | _)
 	exit 1
 	;;
 darwin_386)
-	mksyscall="mksyscall -l32"
-	mksysnum="mksysnum_darwin /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master"
+	mksyscall="mksyscall.sh -l32"
+	mksysnum="mksysnum_darwin.sh /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master"
 	mktypes="godefs -gsyscall -f-m32"
 	;;
 darwin_amd64)
-	mksysnum="mksysnum_darwin /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master"
+	mksysnum="mksysnum_darwin.sh /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master"
 	mktypes="godefs -gsyscall -f-m64"
-	mkerrors="mkerrors"
+	mkerrors="mkerrors.sh"
 	;;
 linux_386)
-	mksyscall="mksyscall -l32"
-	mksysnum="mksysnum_linux /usr/include/asm/unistd_32.h"
+	mksyscall="mksyscall.sh -l32"
+	mksysnum="mksysnum_linux.sh /usr/include/asm/unistd_32.h"
 	mktypes="godefs -gsyscall -f-m32"
 	;;
 linux_amd64)
-	mksysnum="mksysnum_linux /usr/include/asm/unistd_64.h"
+	mksysnum="mksysnum_linux.sh /usr/include/asm/unistd_64.h"
 	mktypes="godefs -gsyscall -f-m64"
 	;;
 *)
diff --git a/src/pkg/syscall/mkerrors b/src/pkg/syscall/mkerrors.sh
similarity index 98%
rename from src/pkg/syscall/mkerrors
rename to src/pkg/syscall/mkerrors.sh
index 015f0214577..15835bdd6af 100755
--- a/src/pkg/syscall/mkerrors
+++ b/src/pkg/syscall/mkerrors.sh
@@ -3,7 +3,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-
 # Generate Go code listing error values (ENAMETOOLONG etc)
 # and signal values (SIGALRM etc).  They're unrelated except
 # that we use the same method for finding them.
@@ -37,7 +36,7 @@ signals=$(
 	echo '};'
 ) >_errors.c
 
-echo '// mkerrors' "$@"
+echo '// mkerrors.sh' "$@"
 echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT'
 echo
 godefs -gsyscall "$@" _errors.c
diff --git a/src/pkg/syscall/mksyscall b/src/pkg/syscall/mksyscall.sh
similarity index 97%
rename from src/pkg/syscall/mksyscall
rename to src/pkg/syscall/mksyscall.sh
index 6a2c916cfc9..0a2fb205577 100755
--- a/src/pkg/syscall/mksyscall
+++ b/src/pkg/syscall/mksyscall.sh
@@ -13,7 +13,7 @@
 #	  the (x, y, z int) shorthand is not allowed.
 #	* If the return parameter is an error number, it must be named errno.
 
-$cmdline = "mksyscall " . join(' ', @ARGV);
+$cmdline = "mksyscall.sh " . join(' ', @ARGV);
 $errors = 0;
 $_32bit = "";
 
@@ -26,7 +26,7 @@ if($ARGV[0] eq "-b32") {
 }
 
 if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall [-b32 | -l32] [file ...]\n";
+	print STDERR "usage: mksyscall.sh [-b32 | -l32] [file ...]\n";
 	exit 1;
 }
 
diff --git a/src/pkg/syscall/mksysnum_darwin b/src/pkg/syscall/mksysnum_darwin.sh
similarity index 92%
rename from src/pkg/syscall/mksysnum_darwin
rename to src/pkg/syscall/mksysnum_darwin.sh
index 74e2dfde97e..192e61a7313 100755
--- a/src/pkg/syscall/mksysnum_darwin
+++ b/src/pkg/syscall/mksysnum_darwin.sh
@@ -6,7 +6,7 @@
 # Generate system call table for Darwin from master list
 # (for example, xnu-1228/bsd/kern/syscalls.master).
 
-my $command = "mksysnum_darwin " . join(' ', @ARGV);
+my $command = "mksysnum_darwin.sh " . join(' ', @ARGV);
 
 print <<EOF;
 // $command
diff --git a/src/pkg/syscall/mksysnum_linux b/src/pkg/syscall/mksysnum_linux.sh
similarity index 79%
rename from src/pkg/syscall/mksysnum_linux
rename to src/pkg/syscall/mksysnum_linux.sh
index 2252bfd7cc1..5f10b61fbce 100755
--- a/src/pkg/syscall/mksysnum_linux
+++ b/src/pkg/syscall/mksysnum_linux.sh
@@ -3,11 +3,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-my $command = "mklinux ". join(' ', @ARGV);
+my $command = "mksysnum_linux.sh ". join(' ', @ARGV);
 
 print <<EOF;
-// Generated by mklinux; DO NOT EDIT.
 // $command
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
 package syscall
 
diff --git a/src/pkg/syscall/zerrors_darwin_386.go b/src/pkg/syscall/zerrors_darwin_386.go
index bc2d17656fc..a19c99dfc91 100644
--- a/src/pkg/syscall/zerrors_darwin_386.go
+++ b/src/pkg/syscall/zerrors_darwin_386.go
@@ -1,4 +1,4 @@
-// mkerrors
+// mkerrors.sh
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 // godefs -gsyscall _errors.c
diff --git a/src/pkg/syscall/zerrors_darwin_amd64.go b/src/pkg/syscall/zerrors_darwin_amd64.go
index bc2d17656fc..a19c99dfc91 100644
--- a/src/pkg/syscall/zerrors_darwin_amd64.go
+++ b/src/pkg/syscall/zerrors_darwin_amd64.go
@@ -1,4 +1,4 @@
-// mkerrors
+// mkerrors.sh
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 // godefs -gsyscall _errors.c
diff --git a/src/pkg/syscall/zerrors_linux_386.go b/src/pkg/syscall/zerrors_linux_386.go
index f1e7e011dad..95d51e93fc4 100644
--- a/src/pkg/syscall/zerrors_linux_386.go
+++ b/src/pkg/syscall/zerrors_linux_386.go
@@ -1,4 +1,4 @@
-// mkerrors
+// mkerrors.sh
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 // godefs -gsyscall _errors.c
diff --git a/src/pkg/syscall/zerrors_linux_amd64.go b/src/pkg/syscall/zerrors_linux_amd64.go
index f1e7e011dad..95d51e93fc4 100644
--- a/src/pkg/syscall/zerrors_linux_amd64.go
+++ b/src/pkg/syscall/zerrors_linux_amd64.go
@@ -1,4 +1,4 @@
-// mkerrors
+// mkerrors.sh
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 // godefs -gsyscall _errors.c
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index 688649abf52..ea4332c49ca 100644
--- a/src/pkg/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
@@ -1,4 +1,4 @@
-// mksyscall -l32 syscall_darwin.go syscall_darwin_386.go
+// mksyscall.sh -l32 syscall_darwin.go syscall_darwin_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 package syscall
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index 28d04c62635..2b6d8123a58 100644
--- a/src/pkg/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
@@ -1,4 +1,4 @@
-// mksyscall syscall_darwin.go syscall_darwin_amd64.go
+// mksyscall.sh syscall_darwin.go syscall_darwin_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 package syscall
diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index 3444c6dfbe7..8a37b132981 100644
--- a/src/pkg/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
@@ -1,4 +1,4 @@
-// mksyscall -l32 syscall_linux.go syscall_linux_386.go
+// mksyscall.sh -l32 syscall_linux.go syscall_linux_386.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 package syscall
diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/pkg/syscall/zsyscall_linux_amd64.go
index 7834cfbeaa9..c01361615ae 100644
--- a/src/pkg/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
@@ -1,4 +1,4 @@
-// mksyscall syscall_linux.go syscall_linux_amd64.go
+// mksyscall.sh syscall_linux.go syscall_linux_amd64.go
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 package syscall
diff --git a/src/pkg/syscall/zsysnum_darwin_386.go b/src/pkg/syscall/zsysnum_darwin_386.go
index c4c48c2a201..3a39407f375 100644
--- a/src/pkg/syscall/zsysnum_darwin_386.go
+++ b/src/pkg/syscall/zsysnum_darwin_386.go
@@ -1,4 +1,4 @@
-// mksysnum_darwin /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master
+// mksysnum_darwin.sh /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
 package syscall
diff --git a/src/pkg/syscall/zsysnum_darwin_amd64.go b/src/pkg/syscall/zsysnum_darwin_amd64.go
index c4c48c2a201..3a39407f375 100644
--- a/src/pkg/syscall/zsysnum_darwin_amd64.go
+++ b/src/pkg/syscall/zsysnum_darwin_amd64.go
@@ -1,4 +1,4 @@
-// mksysnum_darwin /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master
+// mksysnum_darwin.sh /home/rsc/pub/xnu-1228/bsd/kern/syscalls.master
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
 package syscall
diff --git a/src/pkg/syscall/zsysnum_linux_386.go b/src/pkg/syscall/zsysnum_linux_386.go
index 46c1112f8c5..4ff1102816e 100644
--- a/src/pkg/syscall/zsysnum_linux_386.go
+++ b/src/pkg/syscall/zsysnum_linux_386.go
@@ -1,5 +1,5 @@
-// Generated by mklinux; DO NOT EDIT.
-// mklinux /usr/include/asm/unistd_32.h
+// mksysnum_linux.sh /usr/include/asm/unistd_32.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
 package syscall
 
diff --git a/src/pkg/syscall/zsysnum_linux_amd64.go b/src/pkg/syscall/zsysnum_linux_amd64.go
index 94424f3f34f..2fc6d3f4886 100644
--- a/src/pkg/syscall/zsysnum_linux_amd64.go
+++ b/src/pkg/syscall/zsysnum_linux_amd64.go
@@ -1,5 +1,5 @@
-// Generated by mklinux; DO NOT EDIT.
-// mklinux /usr/include/asm/unistd_64.h
+// mksysnum_linux.sh /usr/include/asm/unistd_64.h
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
 package syscall