diff --git a/astutil/imports.go b/astutil/imports.go
index 27262d39eb..5682a66891 100644
--- a/astutil/imports.go
+++ b/astutil/imports.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package astutil contains common utilities for working with the Go AST.
-package astutil
+package astutil // import "golang.org/x/tools/astutil"
 
 import (
 	"bufio"
diff --git a/blog/atom/atom.go b/blog/atom/atom.go
index bc114dd71a..f12c31de6a 100644
--- a/blog/atom/atom.go
+++ b/blog/atom/atom.go
@@ -5,7 +5,7 @@
 // Adapted from encoding/xml/read_test.go.
 
 // Package atom defines XML data structures for an Atom feed.
-package atom
+package atom // import "golang.org/x/tools/blog/atom"
 
 import (
 	"encoding/xml"
diff --git a/blog/blog.go b/blog/blog.go
index b53cf5bd29..23c8dc6d47 100644
--- a/blog/blog.go
+++ b/blog/blog.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package blog implements a web server for articles written in present format.
-package blog
+package blog // import "golang.org/x/tools/blog"
 
 import (
 	"bytes"
diff --git a/cmd/benchcmp/doc.go b/cmd/benchcmp/doc.go
index b0714b9036..f5c7a3619f 100644
--- a/cmd/benchcmp/doc.go
+++ b/cmd/benchcmp/doc.go
@@ -34,4 +34,4 @@ in a format like this:
 	BenchmarkConcat     80            48            -40.00%
 
 */
-package main
+package main // import "golang.org/x/tools/cmd/benchcmp"
diff --git a/cmd/callgraph/main.go b/cmd/callgraph/main.go
index 7f77dd1388..43ac7b4300 100644
--- a/cmd/callgraph/main.go
+++ b/cmd/callgraph/main.go
@@ -4,7 +4,7 @@
 
 // callgraph: a tool for reporting the call graph of a Go program.
 // See Usage for details, or run with -help.
-package main
+package main // import "golang.org/x/tools/cmd/callgraph"
 
 // TODO(adonovan):
 //
diff --git a/cmd/cover/doc.go b/cmd/cover/doc.go
index 636d7e08d9..c90f4606f7 100644
--- a/cmd/cover/doc.go
+++ b/cmd/cover/doc.go
@@ -18,4 +18,4 @@ For usage information, please see:
 	go help testflag
 	go tool cover -help
 */
-package main
+package main // import "golang.org/x/tools/cmd/cover"
diff --git a/cmd/digraph/digraph.go b/cmd/digraph/digraph.go
index 89855a9026..3ad2950015 100644
--- a/cmd/digraph/digraph.go
+++ b/cmd/digraph/digraph.go
@@ -12,7 +12,7 @@
 //   a comment syntax, etc.
 // - allow queries to nest, like Blaze query language.
 //
-package main
+package main // import "golang.org/x/tools/cmd/digraph"
 
 import (
 	"bufio"
diff --git a/cmd/eg/eg.go b/cmd/eg/eg.go
index ed7fb53045..bee24514d9 100644
--- a/cmd/eg/eg.go
+++ b/cmd/eg/eg.go
@@ -1,7 +1,7 @@
 // The eg command performs example-based refactoring.
 // For documentation, run the command, or see Help in
 // code.google.com/p/go.tools/refactor/eg.
-package main
+package main // import "golang.org/x/tools/cmd/eg"
 
 import (
 	"flag"
diff --git a/cmd/godex/doc.go b/cmd/godex/doc.go
index 90268e2c54..ceb7c2fe14 100644
--- a/cmd/godex/doc.go
+++ b/cmd/godex/doc.go
@@ -63,7 +63,7 @@
 //
 // If no -s argument is provided, godex will try to find a matching source.
 //
-package main
+package main // import "golang.org/x/tools/cmd/godex"
 
 // BUG(gri): support for -s=source is not yet implemented
 // BUG(gri): gccgo-importing appears to have occasional problems stalling godex; try -s=gc as work-around
diff --git a/cmd/godoc/doc.go b/cmd/godoc/doc.go
index 88ff201889..dd7f3c1adc 100644
--- a/cmd/godoc/doc.go
+++ b/cmd/godoc/doc.go
@@ -141,4 +141,4 @@ See "Godoc: documenting Go code" for how to write good comments for godoc:
 http://golang.org/doc/articles/godoc_documenting_go_code.html
 
 */
-package main
+package main // import "golang.org/x/tools/cmd/godoc"
diff --git a/cmd/goimports/doc.go b/cmd/goimports/doc.go
index a64ad9304d..c7d2da3e45 100644
--- a/cmd/goimports/doc.go
+++ b/cmd/goimports/doc.go
@@ -30,4 +30,4 @@ For other editors, you probably know what to do.
 Happy hacking!
 
 */
-package main
+package main // import "golang.org/x/tools/cmd/goimports"
diff --git a/cmd/gorename/main.go b/cmd/gorename/main.go
index c321432a6a..abf059a1c7 100644
--- a/cmd/gorename/main.go
+++ b/cmd/gorename/main.go
@@ -1,7 +1,7 @@
 // The gorename command performs precise type-safe renaming of
 // identifiers in Go source code.  See the -help message or Usage
 // constant for details.
-package main
+package main // import "golang.org/x/tools/cmd/gorename"
 
 import (
 	"flag"
diff --git a/cmd/gotype/doc.go b/cmd/gotype/doc.go
index e689378183..ea0b2b1f1b 100644
--- a/cmd/gotype/doc.go
+++ b/cmd/gotype/doc.go
@@ -59,4 +59,4 @@ To verify the output of a pipe:
 	echo "package foo" | gotype
 
 */
-package main
+package main // import "golang.org/x/tools/cmd/gotype"
diff --git a/cmd/html2article/conv.go b/cmd/html2article/conv.go
index ae14a25f58..d9d5e9d9df 100644
--- a/cmd/html2article/conv.go
+++ b/cmd/html2article/conv.go
@@ -4,7 +4,7 @@
 
 // This program takes an HTML file and outputs a corresponding article file in
 // present format. See: golang.org/x/tools/present
-package main
+package main // import "golang.org/x/tools/cmd/html2article"
 
 import (
 	"bufio"
diff --git a/cmd/oracle/main.go b/cmd/oracle/main.go
index f9e895a34f..56bc72b43e 100644
--- a/cmd/oracle/main.go
+++ b/cmd/oracle/main.go
@@ -8,7 +8,7 @@
 //
 // Run with -help flag or help subcommand for usage information.
 //
-package main
+package main // import "golang.org/x/tools/cmd/oracle"
 
 import (
 	"bufio"
diff --git a/cmd/present/doc.go b/cmd/present/doc.go
index 1b81c3114d..0fe11cd845 100644
--- a/cmd/present/doc.go
+++ b/cmd/present/doc.go
@@ -28,4 +28,4 @@ the generated output. The supported formats are:
 The present file format is documented by the present package:
 http://godoc.org/golang.org/x/tools/present
 */
-package main
+package main // import "golang.org/x/tools/cmd/present"
diff --git a/cmd/ssadump/main.go b/cmd/ssadump/main.go
index 91445213c2..2050780cd6 100644
--- a/cmd/ssadump/main.go
+++ b/cmd/ssadump/main.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // ssadump: a tool for displaying and interpreting the SSA form of Go programs.
-package main
+package main // import "golang.org/x/tools/cmd/ssadump"
 
 import (
 	"flag"
diff --git a/cmd/stringer/stringer.go b/cmd/stringer/stringer.go
index f7039aa251..40a9eede7e 100644
--- a/cmd/stringer/stringer.go
+++ b/cmd/stringer/stringer.go
@@ -56,7 +56,7 @@
 // where t is the lower-cased name of the first type listed. It can be overridden
 // with the -output flag.
 //
-package main
+package main // import "golang.org/x/tools/cmd/stringer"
 
 import (
 	"bytes"
diff --git a/cmd/vet/doc.go b/cmd/vet/doc.go
index e90a8b87d5..2ae32d1a27 100644
--- a/cmd/vet/doc.go
+++ b/cmd/vet/doc.go
@@ -179,4 +179,4 @@ These flags configure the behavior of vet:
 	-test
 		For testing only: sets -all and -shadow.
 */
-package main
+package main // import "golang.org/x/tools/cmd/vet"
diff --git a/cmd/vet/whitelist/whitelist.go b/cmd/vet/whitelist/whitelist.go
index 975c9e3780..9bf40ee534 100644
--- a/cmd/vet/whitelist/whitelist.go
+++ b/cmd/vet/whitelist/whitelist.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package whitelist defines exceptions for the vet tool.
-package whitelist
+package whitelist // import "golang.org/x/tools/cmd/vet/whitelist"
 
 // UnkeyedLiteral are types that are actually slices, but
 // syntactically, we cannot tell whether the Typ in pkg.Typ{1, 2, 3}
diff --git a/container/intsets/sparse.go b/container/intsets/sparse.go
index 0ba7cb2346..fa32a0f156 100644
--- a/container/intsets/sparse.go
+++ b/container/intsets/sparse.go
@@ -11,7 +11,7 @@
 // map type.  The IsEmpty, Min, Max, Clear and TakeMin operations
 // require constant time.
 //
-package intsets
+package intsets // import "golang.org/x/tools/container/intsets"
 
 // TODO(adonovan):
 // - Add SymmetricDifference(x, y *Sparse), i.e. x ∆ y.
diff --git a/cover/profile.go b/cover/profile.go
index 1cbd739882..83efb0b3c0 100644
--- a/cover/profile.go
+++ b/cover/profile.go
@@ -4,7 +4,7 @@
 
 // Package cover provides support for parsing coverage profiles
 // generated by "go test -coverprofile=cover.out".
-package cover
+package cover // import "golang.org/x/tools/cover"
 
 import (
 	"bufio"
diff --git a/dashboard/builder/doc.go b/dashboard/builder/doc.go
index 5192861704..e958e8993b 100644
--- a/dashboard/builder/doc.go
+++ b/dashboard/builder/doc.go
@@ -55,4 +55,4 @@ If the Google Code credentials are not provided the archival step
 will be skipped.
 
 */
-package main
+package main // import "golang.org/x/tools/dashboard/builder"
diff --git a/dashboard/coordinator/buildongce/create.go b/dashboard/coordinator/buildongce/create.go
index d4f0cd679f..82b3418b8b 100644
--- a/dashboard/coordinator/buildongce/create.go
+++ b/dashboard/coordinator/buildongce/create.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package main // import "golang.org/x/tools/dashboard/coordinator/buildongce"
 
 import (
 	"bufio"
diff --git a/dashboard/coordinator/main.go b/dashboard/coordinator/main.go
index 07565d0765..cd709ad414 100644
--- a/dashboard/coordinator/main.go
+++ b/dashboard/coordinator/main.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // The coordinator runs on GCE and coordinates builds in Docker containers.
-package main
+package main // import "golang.org/x/tools/dashboard/coordinator"
 
 import (
 	"bytes"
diff --git a/dashboard/updater/updater.go b/dashboard/updater/updater.go
index 0601611de0..81919f6f3b 100644
--- a/dashboard/updater/updater.go
+++ b/dashboard/updater/updater.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package main // import "golang.org/x/tools/dashboard/updater"
 
 import (
 	"bytes"
diff --git a/dashboard/watcher/watcher.go b/dashboard/watcher/watcher.go
index 6b54180d11..96a6e2ec34 100644
--- a/dashboard/watcher/watcher.go
+++ b/dashboard/watcher/watcher.go
@@ -4,7 +4,7 @@
 
 // Command watcher watches the specified repository for new commits
 // and reports them to the build dashboard.
-package main
+package main // import "golang.org/x/tools/dashboard/watcher"
 
 import (
 	"bytes"
diff --git a/go/buildutil/allpackages.go b/go/buildutil/allpackages.go
index 1da5560e17..c95db42c35 100644
--- a/go/buildutil/allpackages.go
+++ b/go/buildutil/allpackages.go
@@ -7,7 +7,7 @@
 //
 // All I/O is done via the build.Context file system interface, which must
 // be concurrency-safe.
-package buildutil
+package buildutil // import "golang.org/x/tools/go/buildutil"
 
 import (
 	"go/build"
diff --git a/go/callgraph/callgraph.go b/go/callgraph/callgraph.go
index d0e12d8791..dad8c22c4c 100644
--- a/go/callgraph/callgraph.go
+++ b/go/callgraph/callgraph.go
@@ -32,7 +32,7 @@ in the call graph; they are treated like built-in operators of the
 language.
 
 */
-package callgraph
+package callgraph // import "golang.org/x/tools/go/callgraph"
 
 // TODO(adonovan): add a function to eliminate wrappers from the
 // callgraph, preserving topology.
diff --git a/go/callgraph/cha/cha.go b/go/callgraph/cha/cha.go
index 2fbc72e0d0..fcdf68695a 100644
--- a/go/callgraph/cha/cha.go
+++ b/go/callgraph/cha/cha.go
@@ -17,7 +17,7 @@
 // and all concrete types are put into interfaces, it is sound to run on
 // partial programs, such as libraries without a main or test function.
 //
-package cha
+package cha // import "golang.org/x/tools/go/callgraph/cha"
 
 import (
 	"golang.org/x/tools/go/callgraph"
diff --git a/go/callgraph/rta/rta.go b/go/callgraph/rta/rta.go
index c4e291623f..8d22da609e 100644
--- a/go/callgraph/rta/rta.go
+++ b/go/callgraph/rta/rta.go
@@ -40,7 +40,7 @@
 // cmd/callgraph tool on its own source takes ~2.1s for RTA and ~5.4s
 // for points-to analysis.
 //
-package rta
+package rta // import "golang.org/x/tools/go/callgraph/rta"
 
 // TODO(adonovan): test it by connecting it to the interpreter and
 // replacing all "unreachable" functions by a special intrinsic, and
diff --git a/go/callgraph/static/static.go b/go/callgraph/static/static.go
index f787fffaed..ebb183bdc4 100644
--- a/go/callgraph/static/static.go
+++ b/go/callgraph/static/static.go
@@ -1,6 +1,6 @@
 // Package static computes the call graph of a Go program containing
 // only static call edges.
-package static
+package static // import "golang.org/x/tools/go/callgraph/static"
 
 import (
 	"golang.org/x/tools/go/callgraph"
diff --git a/go/exact/exact.go b/go/exact/exact.go
index e8fbfe974a..51c490624a 100644
--- a/go/exact/exact.go
+++ b/go/exact/exact.go
@@ -11,7 +11,7 @@
 // values produce unknown values unless specified
 // otherwise.
 //
-package exact
+package exact // import "golang.org/x/tools/go/exact"
 
 import (
 	"fmt"
diff --git a/go/gccgoimporter/importer.go b/go/gccgoimporter/importer.go
index a2b772bf02..59576cad29 100644
--- a/go/gccgoimporter/importer.go
+++ b/go/gccgoimporter/importer.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package gccgoimporter implements Import for gccgo-generated object files.
-package gccgoimporter
+package gccgoimporter // import "golang.org/x/tools/go/gccgoimporter"
 
 import (
 	"bytes"
diff --git a/go/gcimporter/gcimporter.go b/go/gcimporter/gcimporter.go
index b6844b456f..5df01a736f 100644
--- a/go/gcimporter/gcimporter.go
+++ b/go/gcimporter/gcimporter.go
@@ -4,7 +4,7 @@
 
 // Package gcimporter implements Import for gc-generated object files.
 // Importing this package installs Import as go/types.DefaultImport.
-package gcimporter
+package gcimporter // import "golang.org/x/tools/go/gcimporter"
 
 import (
 	"bufio"
diff --git a/go/importer/import.go b/go/importer/import.go
index 3604c98ee6..2b6e279961 100644
--- a/go/importer/import.go
+++ b/go/importer/import.go
@@ -7,7 +7,7 @@
 // by R. Griesemer, Technical Report 156, ETH Zürich, 1991.
 
 // package importer implements an exporter and importer for Go export data.
-package importer
+package importer // import "golang.org/x/tools/go/importer"
 
 import (
 	"encoding/binary"
diff --git a/go/loader/loader.go b/go/loader/loader.go
index 82165a9f9e..c568ea2fd2 100644
--- a/go/loader/loader.go
+++ b/go/loader/loader.go
@@ -73,7 +73,7 @@
 // DEPENDENCY is a package loaded to satisfy an import in an initial
 // package or another dependency.
 //
-package loader
+package loader // import "golang.org/x/tools/go/loader"
 
 // 'go test', in-package test files, and import cycles
 // ---------------------------------------------------
diff --git a/go/pointer/doc.go b/go/pointer/doc.go
index 00bf2a4e1e..22e569cd0d 100644
--- a/go/pointer/doc.go
+++ b/go/pointer/doc.go
@@ -607,4 +607,4 @@ ACM, New York, NY, USA, 47-56. DOI=10.1145/349299.349310
 http://doi.acm.org/10.1145/349299.349310
 
 */
-package pointer
+package pointer // import "golang.org/x/tools/go/pointer"
diff --git a/go/ssa/doc.go b/go/ssa/doc.go
index 0b5c33df52..d6660733a2 100644
--- a/go/ssa/doc.go
+++ b/go/ssa/doc.go
@@ -120,4 +120,4 @@
 // domains of source locations, ast.Nodes, types.Objects,
 // ssa.Values/Instructions.
 //
-package ssa
+package ssa // import "golang.org/x/tools/go/ssa"
diff --git a/go/ssa/interp/interp.go b/go/ssa/interp/interp.go
index d674c25a18..16a76a86e4 100644
--- a/go/ssa/interp/interp.go
+++ b/go/ssa/interp/interp.go
@@ -42,7 +42,7 @@
 //
 // * os.Exit is implemented using panic, causing deferred functions to
 // run.
-package interp
+package interp // import "golang.org/x/tools/go/ssa/interp"
 
 import (
 	"fmt"
diff --git a/go/ssa/ssautil/visit.go b/go/ssa/ssautil/visit.go
index 8dc66946df..14de154005 100644
--- a/go/ssa/ssautil/visit.go
+++ b/go/ssa/ssautil/visit.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package ssautil
+package ssautil // import "golang.org/x/tools/go/ssa/ssautil"
 
 import "golang.org/x/tools/go/ssa"
 
diff --git a/go/types/api.go b/go/types/api.go
index bfdcccb0d9..ae53f7c9d2 100644
--- a/go/types/api.go
+++ b/go/types/api.go
@@ -20,7 +20,7 @@
 // and checks for compliance with the language specification.
 // Use Info.Types[expr].Type for the results of type inference.
 //
-package types
+package types // import "golang.org/x/tools/go/types"
 
 import (
 	"bytes"
diff --git a/go/types/typeutil/map.go b/go/types/typeutil/map.go
index bf1ed2d956..b3a04ccd74 100644
--- a/go/types/typeutil/map.go
+++ b/go/types/typeutil/map.go
@@ -4,7 +4,7 @@
 
 // Package typeutil defines various utilities for types, such as Map,
 // a mapping from types.Type to interface{} values.
-package typeutil
+package typeutil // import "golang.org/x/tools/go/types/typeutil"
 
 import (
 	"bytes"
diff --git a/go/vcs/vcs.go b/go/vcs/vcs.go
index 700b84da16..2d9b7de3b3 100644
--- a/go/vcs/vcs.go
+++ b/go/vcs/vcs.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package vcs
+package vcs // import "golang.org/x/tools/go/vcs"
 
 import (
 	"bytes"
diff --git a/godoc/analysis/analysis.go b/godoc/analysis/analysis.go
index 26424953cc..ef060b2f8d 100644
--- a/godoc/analysis/analysis.go
+++ b/godoc/analysis/analysis.go
@@ -40,7 +40,7 @@
 // location is highlighted in red and hover text provides the compiler
 // error message.
 //
-package analysis
+package analysis // import "golang.org/x/tools/godoc/analysis"
 
 import (
 	"fmt"
diff --git a/godoc/godoc.go b/godoc/godoc.go
index 8ec731c7ce..e77a81f522 100644
--- a/godoc/godoc.go
+++ b/godoc/godoc.go
@@ -7,7 +7,7 @@
 //
 // This package comment will evolve over time as this package splits
 // into smaller pieces.
-package godoc
+package godoc // import "golang.org/x/tools/godoc"
 
 import (
 	"bytes"
diff --git a/godoc/redirect/redirect.go b/godoc/redirect/redirect.go
index b58b962c92..7ce1698a0c 100644
--- a/godoc/redirect/redirect.go
+++ b/godoc/redirect/redirect.go
@@ -5,7 +5,7 @@
 // Package redirect provides hooks to register HTTP handlers that redirect old
 // godoc paths to their new equivalents and assist in accessing the issue
 // tracker, wiki, code review system, etc.
-package redirect
+package redirect // import "golang.org/x/tools/godoc/redirect"
 
 import (
 	"net/http"
diff --git a/godoc/static/doc.go b/godoc/static/doc.go
index 5ef96ae0e2..b3d8bcf34b 100644
--- a/godoc/static/doc.go
+++ b/godoc/static/doc.go
@@ -5,4 +5,4 @@
 // Package static exports a map of static file content that supports the godoc
 // user interface. The map should be used with the mapfs package, see
 // golang.org/x/tools/godoc/vfs/mapfs.
-package static
+package static // import "golang.org/x/tools/godoc/static"
diff --git a/godoc/util/util.go b/godoc/util/util.go
index d6416df16d..feedb7688a 100644
--- a/godoc/util/util.go
+++ b/godoc/util/util.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package util contains utility types and functions for godoc.
-package util
+package util // import "golang.org/x/tools/godoc/util"
 
 import (
 	pathpkg "path"
diff --git a/godoc/vfs/gatefs/gatefs.go b/godoc/vfs/gatefs/gatefs.go
index cb8ec030bc..7045a5cadd 100644
--- a/godoc/vfs/gatefs/gatefs.go
+++ b/godoc/vfs/gatefs/gatefs.go
@@ -4,7 +4,7 @@
 
 // Package gatefs provides an implementation of the FileSystem
 // interface that wraps another FileSystem and limits its concurrency.
-package gatefs
+package gatefs // import "golang.org/x/tools/godoc/vfs/gatefs"
 
 import (
 	"fmt"
diff --git a/godoc/vfs/httpfs/httpfs.go b/godoc/vfs/httpfs/httpfs.go
index e4beeecf85..f232f03ffd 100644
--- a/godoc/vfs/httpfs/httpfs.go
+++ b/godoc/vfs/httpfs/httpfs.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package httpfs implements http.FileSystem using a godoc vfs.FileSystem.
-package httpfs
+package httpfs // import "golang.org/x/tools/godoc/vfs/httpfs"
 
 import (
 	"fmt"
diff --git a/godoc/vfs/mapfs/mapfs.go b/godoc/vfs/mapfs/mapfs.go
index 6da3c0af4d..660b1ca787 100644
--- a/godoc/vfs/mapfs/mapfs.go
+++ b/godoc/vfs/mapfs/mapfs.go
@@ -4,7 +4,7 @@
 
 // Package mapfs file provides an implementation of the FileSystem
 // interface based on the contents of a map[string]string.
-package mapfs
+package mapfs // import "golang.org/x/tools/godoc/vfs/mapfs"
 
 import (
 	"io"
diff --git a/godoc/vfs/vfs.go b/godoc/vfs/vfs.go
index 937c2b2f7d..ad06b1a1d5 100644
--- a/godoc/vfs/vfs.go
+++ b/godoc/vfs/vfs.go
@@ -4,7 +4,7 @@
 
 // Package vfs defines types for abstract file system access and provides an
 // implementation accessing the file system of the underlying OS.
-package vfs
+package vfs // import "golang.org/x/tools/godoc/vfs"
 
 import (
 	"io"
diff --git a/godoc/vfs/zipfs/zipfs.go b/godoc/vfs/zipfs/zipfs.go
index 0e04a4a0c6..87eaf8d649 100644
--- a/godoc/vfs/zipfs/zipfs.go
+++ b/godoc/vfs/zipfs/zipfs.go
@@ -15,7 +15,7 @@
 //   like absolute paths w/o a leading '/'; i.e., the paths are considered
 //   relative to the root of the file system.
 // - All path arguments to file system methods must be absolute paths.
-package zipfs
+package zipfs // import "golang.org/x/tools/godoc/vfs/zipfs"
 
 import (
 	"archive/zip"
diff --git a/imports/imports.go b/imports/imports.go
index b97529e444..c521ae8c47 100644
--- a/imports/imports.go
+++ b/imports/imports.go
@@ -4,7 +4,7 @@
 
 // Package imports implements a Go pretty-printer (like package "go/format")
 // that also adds or removes import statements as necessary.
-package imports
+package imports // import "golang.org/x/tools/imports"
 
 import (
 	"bufio"
diff --git a/oracle/oracle.go b/oracle/oracle.go
index f9c13e8257..34a521d09c 100644
--- a/oracle/oracle.go
+++ b/oracle/oracle.go
@@ -8,7 +8,7 @@
 // http://golang.org/s/oracle-design
 // http://golang.org/s/oracle-user-manual
 //
-package oracle
+package oracle // import "golang.org/x/tools/oracle"
 
 // This file defines oracle.Query, the entry point for the oracle tool.
 // The actual executable is defined in cmd/oracle.
diff --git a/playground/common.go b/playground/common.go
index 055136297c..3ffce88337 100644
--- a/playground/common.go
+++ b/playground/common.go
@@ -5,7 +5,7 @@
 // Package playground registers HTTP handlers at "/compile" and "/share" that
 // proxy requests to the golang.org playground service.
 // This package may be used unaltered on App Engine.
-package playground
+package playground // import "golang.org/x/tools/playground"
 
 import (
 	"bytes"
diff --git a/playground/socket/socket.go b/playground/socket/socket.go
index fe1ac9ee07..6905d0c2a0 100644
--- a/playground/socket/socket.go
+++ b/playground/socket/socket.go
@@ -11,7 +11,7 @@
 // The wire format is JSON and is described by the Message type.
 //
 // This will not run on App Engine as WebSockets are not supported there.
-package socket
+package socket // import "golang.org/x/tools/playground/socket"
 
 import (
 	"bytes"
diff --git a/present/doc.go b/present/doc.go
index cc2f0088a8..584e0c1c46 100644
--- a/present/doc.go
+++ b/present/doc.go
@@ -202,4 +202,4 @@ It is your responsibilty to make sure the included HTML is valid and safe.
 	.html file.html
 
 */
-package present
+package present // import "golang.org/x/tools/present"
diff --git a/refactor/eg/eg.go b/refactor/eg/eg.go
index 933078f087..a1072044fb 100644
--- a/refactor/eg/eg.go
+++ b/refactor/eg/eg.go
@@ -1,6 +1,6 @@
 // Package eg implements the example-based refactoring tool whose
 // command-line is defined in golang.org/x/tools/cmd/eg.
-package eg
+package eg // import "golang.org/x/tools/refactor/eg"
 
 import (
 	"bytes"
diff --git a/refactor/importgraph/graph.go b/refactor/importgraph/graph.go
index 777fee882e..6f49fabcd9 100644
--- a/refactor/importgraph/graph.go
+++ b/refactor/importgraph/graph.go
@@ -4,7 +4,7 @@
 
 // Package importgraph computes the forward and reverse import
 // dependency graphs for all packages in a Go workspace.
-package importgraph
+package importgraph // import "golang.org/x/tools/refactor/importgraph"
 
 import (
 	"go/build"
diff --git a/refactor/lexical/lexical.go b/refactor/lexical/lexical.go
index 31dfb0f7b4..55ec391aca 100644
--- a/refactor/lexical/lexical.go
+++ b/refactor/lexical/lexical.go
@@ -9,7 +9,7 @@
 //
 // THIS INTERFACE IS EXPERIMENTAL AND MAY CHANGE OR BE REMOVED IN FUTURE.
 //
-package lexical
+package lexical // import "golang.org/x/tools/refactor/lexical"
 
 // OVERVIEW
 //
diff --git a/refactor/rename/rename.go b/refactor/rename/rename.go
index 3516a724e8..dabfbee564 100644
--- a/refactor/rename/rename.go
+++ b/refactor/rename/rename.go
@@ -5,7 +5,7 @@
 // Package rename contains the implementation of the 'gorename' command
 // whose main function is in golang.org/x/tools/refactor/rename.
 // See that package for the command documentation.
-package rename
+package rename // import "golang.org/x/tools/refactor/rename"
 
 import (
 	"errors"
diff --git a/refactor/satisfy/find.go b/refactor/satisfy/find.go
index a54dc7062e..3972637e69 100644
--- a/refactor/satisfy/find.go
+++ b/refactor/satisfy/find.go
@@ -15,7 +15,7 @@
 // since it is computing it anyway, and it is robust for ill-typed
 // inputs, which this package is not.
 //
-package satisfy
+package satisfy // import "golang.org/x/tools/refactor/satisfy"
 
 // NOTES:
 //