diff --git a/src/cmd/5a/doc.go b/src/cmd/5a/doc.go
index a0d2c4c648f..62d6ee9cd4e 100644
--- a/src/cmd/5a/doc.go
+++ b/src/cmd/5a/doc.go
@@ -6,7 +6,7 @@
 
 5a is a version of the Plan 9 assembler.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2a
+	http://plan9.bell-labs.com/magic/man2html/1/8a
 
 Its target architecture is the ARM, referred to by these tools as arm.
 
diff --git a/src/cmd/5c/doc.go b/src/cmd/5c/doc.go
index 0874293bf40..0fc02782942 100644
--- a/src/cmd/5c/doc.go
+++ b/src/cmd/5c/doc.go
@@ -6,7 +6,7 @@
 
 5c is a version of the Plan 9 C compiler.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2c
+	http://plan9.bell-labs.com/magic/man2html/1/8c
 
 Its target architecture is the ARM, referred to by these tools as arm.
 
diff --git a/src/cmd/6a/doc.go b/src/cmd/6a/doc.go
index 92fb74de663..f8370a05f3e 100644
--- a/src/cmd/6a/doc.go
+++ b/src/cmd/6a/doc.go
@@ -6,7 +6,7 @@
 
 6a is a version of the Plan 9 assembler.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2a
+	http://plan9.bell-labs.com/magic/man2html/1/8a
 
 Its target architecture is the x86-64, referred to by these tools as amd64.
 
diff --git a/src/cmd/6c/doc.go b/src/cmd/6c/doc.go
index 249a8ed801e..7f6fb77f16c 100644
--- a/src/cmd/6c/doc.go
+++ b/src/cmd/6c/doc.go
@@ -6,7 +6,7 @@
 
 6c is a version of the Plan 9 C compiler.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2c
+	http://plan9.bell-labs.com/magic/man2html/1/8c
 
 Its target architecture is the x86-64, referred to by these tools as amd64.
 
diff --git a/src/cmd/8a/doc.go b/src/cmd/8a/doc.go
index a43b4461f6b..59f286e1999 100644
--- a/src/cmd/8a/doc.go
+++ b/src/cmd/8a/doc.go
@@ -6,7 +6,7 @@
 
 8a is a version of the Plan 9 assembler.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2a
+	http://plan9.bell-labs.com/magic/man2html/1/8a
 
 Its target architecture is the x86, referred to by these tools for historical reasons as 386.
 
diff --git a/src/cmd/8c/doc.go b/src/cmd/8c/doc.go
index e3aae857f6a..5d94c4b0d95 100644
--- a/src/cmd/8c/doc.go
+++ b/src/cmd/8c/doc.go
@@ -6,7 +6,7 @@
 
 8c is a version of the Plan 9 C compiler.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2c
+	http://plan9.bell-labs.com/magic/man2html/1/8c
 
 Its target architecture is the x86, referred to by these tools for historical reasons as 386.
 
diff --git a/src/cmd/ld/doc.go b/src/cmd/ld/doc.go
index cf22ba8d80e..108f1c6502c 100644
--- a/src/cmd/ld/doc.go
+++ b/src/cmd/ld/doc.go
@@ -6,7 +6,7 @@
 
 Ld is the portable code for a modified version of the Plan 9 linker.  The original is documented at
 
-	http://plan9.bell-labs.com/magic/man2html/1/2l
+	http://plan9.bell-labs.com/magic/man2html/1/8l
 
 It reads object files (.5, .6, or .8 files) and writes a binary named for the
 architecture (5.out, 6.out, 8.out) by default (if $GOOS is windows, a .exe suffix