diff --git a/gosrc/data.go b/gosrc/data.go
index 417e12a..85255b3 100644
--- a/gosrc/data.go
+++ b/gosrc/data.go
@@ -11,13 +11,93 @@
 )
 
 var pathFlags = map[string]int{
-	"C":                               2,
-	"archive":                         1,
-	"archive/tar":                     3,
-	"archive/zip":                     3,
-	"bufio":                           3,
-	"builtin":                         3,
-	"bytes":                           3,
+	"C":                                       2,
+	"archive":                                 1,
+	"archive/tar":                             3,
+	"archive/zip":                             3,
+	"bufio":                                   3,
+	"builtin":                                 3,
+	"bytes":                                   3,
+	"cmd":                                     1,
+	"cmd/addr2line":                           3,
+	"cmd/asm":                                 3,
+	"cmd/asm/internal":                        1,
+	"cmd/asm/internal/arch":                   3,
+	"cmd/asm/internal/asm":                    3,
+	"cmd/asm/internal/flags":                  3,
+	"cmd/asm/internal/lex":                    3,
+	"cmd/cgo":                                 3,
+	"cmd/compile":                             3,
+	"cmd/compile/internal":                    1,
+	"cmd/compile/internal/amd64":              3,
+	"cmd/compile/internal/arm":                3,
+	"cmd/compile/internal/arm64":              3,
+	"cmd/compile/internal/big":                3,
+	"cmd/compile/internal/gc":                 3,
+	"cmd/compile/internal/mips64":             3,
+	"cmd/compile/internal/ppc64":              3,
+	"cmd/compile/internal/s390x":              3,
+	"cmd/compile/internal/ssa":                3,
+	"cmd/compile/internal/test":               3,
+	"cmd/compile/internal/x86":                3,
+	"cmd/cover":                               3,
+	"cmd/dist":                                3,
+	"cmd/doc":                                 3,
+	"cmd/fix":                                 3,
+	"cmd/go":                                  3,
+	"cmd/gofmt":                               3,
+	"cmd/internal":                            1,
+	"cmd/internal/bio":                        3,
+	"cmd/internal/gcprog":                     3,
+	"cmd/internal/goobj":                      3,
+	"cmd/internal/obj":                        3,
+	"cmd/internal/obj/arm":                    3,
+	"cmd/internal/obj/arm64":                  3,
+	"cmd/internal/obj/mips":                   3,
+	"cmd/internal/obj/ppc64":                  3,
+	"cmd/internal/obj/s390x":                  3,
+	"cmd/internal/obj/x86":                    3,
+	"cmd/internal/objfile":                    3,
+	"cmd/internal/pprof":                      1,
+	"cmd/internal/pprof/commands":             3,
+	"cmd/internal/pprof/driver":               3,
+	"cmd/internal/pprof/fetch":                3,
+	"cmd/internal/pprof/plugin":               3,
+	"cmd/internal/pprof/profile":              3,
+	"cmd/internal/pprof/report":               3,
+	"cmd/internal/pprof/svg":                  3,
+	"cmd/internal/pprof/symbolizer":           3,
+	"cmd/internal/pprof/symbolz":              3,
+	"cmd/internal/pprof/tempfile":             3,
+	"cmd/internal/sys":                        3,
+	"cmd/link":                                3,
+	"cmd/link/internal":                       1,
+	"cmd/link/internal/amd64":                 3,
+	"cmd/link/internal/arm":                   3,
+	"cmd/link/internal/arm64":                 3,
+	"cmd/link/internal/ld":                    3,
+	"cmd/link/internal/mips64":                3,
+	"cmd/link/internal/ppc64":                 3,
+	"cmd/link/internal/s390x":                 3,
+	"cmd/link/internal/x86":                   3,
+	"cmd/nm":                                  3,
+	"cmd/objdump":                             3,
+	"cmd/pack":                                3,
+	"cmd/pprof":                               3,
+	"cmd/trace":                               3,
+	"cmd/vendor":                              1,
+	"cmd/vendor/golang.org":                   1,
+	"cmd/vendor/golang.org/x":                 1,
+	"cmd/vendor/golang.org/x/arch":            1,
+	"cmd/vendor/golang.org/x/arch/arm":        1,
+	"cmd/vendor/golang.org/x/arch/arm/armasm": 3,
+	"cmd/vendor/golang.org/x/arch/x86":        1,
+	"cmd/vendor/golang.org/x/arch/x86/x86asm": 3,
+	"cmd/vet":                         3,
+	"cmd/vet/internal":                1,
+	"cmd/vet/internal/cfg":            3,
+	"cmd/vet/internal/whitelist":      3,
+	"cmd/yacc":                        3,
 	"compress":                        1,
 	"compress/bzip2":                  3,
 	"compress/flate":                  3,
diff --git a/gosrc/gen.go b/gosrc/gen.go
index 3f74265..29fb535 100644
--- a/gosrc/gen.go
+++ b/gosrc/gen.go
@@ -57,7 +57,7 @@
 
 	// Build map of standard repository path flags.
 
-	cmd := exec.Command("go", "list", "std")
+	cmd := exec.Command("go", "list", "std", "cmd")
 	p, err := cmd.Output()
 	if err != nil {
 		log.Fatal(err)
@@ -67,9 +67,6 @@
 		"C":       packagePath,
 	}
 	for _, path := range strings.Fields(string(p)) {
-		if strings.HasPrefix(path, "cmd/") {
-			continue
-		}
 		pathFlags[path] |= packagePath | goRepoPath
 		for {
 			i := strings.LastIndex(path, "/")