diff --git a/context/context.go b/context/context.go
index 66aff7c..490245d 100644
--- a/context/context.go
+++ b/context/context.go
@@ -34,7 +34,7 @@
 //
 // See http://blog.golang.org/context for example code for a server that uses
 // Contexts.
-package context
+package context // import "golang.org/x/net/context"
 
 import (
 	"errors"
diff --git a/dict/dict.go b/dict/dict.go
index e7f5290..58fef89 100644
--- a/dict/dict.go
+++ b/dict/dict.go
@@ -4,7 +4,7 @@
 
 // Package dict implements the Dictionary Server Protocol
 // as defined in RFC 2229.
-package dict
+package dict // import "golang.org/x/net/dict"
 
 import (
 	"net/textproto"
diff --git a/html/atom/atom.go b/html/atom/atom.go
index 227404b..cd0a8ac 100644
--- a/html/atom/atom.go
+++ b/html/atom/atom.go
@@ -15,7 +15,7 @@
 // whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
 // be dense. The only guarantees are that e.g. looking up "div" will yield
 // atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
-package atom
+package atom // import "golang.org/x/net/html/atom"
 
 // Atom is an integer code for a string. The zero value maps to "".
 type Atom uint32
diff --git a/html/charset/charset.go b/html/charset/charset.go
index b19f83b..2e5f9ba 100644
--- a/html/charset/charset.go
+++ b/html/charset/charset.go
@@ -6,7 +6,7 @@
 //
 // The mapping from encoding labels to encodings is defined at
 // http://encoding.spec.whatwg.org.
-package charset
+package charset // import "golang.org/x/net/html/charset"
 
 import (
 	"bytes"
diff --git a/html/doc.go b/html/doc.go
index fac0f54..32379a3 100644
--- a/html/doc.go
+++ b/html/doc.go
@@ -93,7 +93,7 @@
 http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html and
 http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html
 */
-package html
+package html // import "golang.org/x/net/html"
 
 // The tokenization algorithm implemented by this package is not a line-by-line
 // transliteration of the relatively verbose state-machine in the WHATWG
diff --git a/icmp/message.go b/icmp/message.go
index 3b4f8a4..3d89108 100644
--- a/icmp/message.go
+++ b/icmp/message.go
@@ -7,7 +7,7 @@
 // ICMPv4 and ICMPv6.
 //
 // ICMPv4 and ICMPv6 are defined in RFC 792 and RFC 4443.
-package icmp
+package icmp // import "golang.org/x/net/icmp"
 
 import (
 	"errors"
diff --git a/idna/idna.go b/idna/idna.go
index 35ff39d..3daa897 100644
--- a/idna/idna.go
+++ b/idna/idna.go
@@ -5,7 +5,7 @@
 // Package idna implements IDNA2008 (Internationalized Domain Names for
 // Applications), defined in RFC 5890, RFC 5891, RFC 5892, RFC 5893 and
 // RFC 5894.
-package idna
+package idna // import "golang.org/x/net/idna"
 
 import (
 	"strings"
diff --git a/internal/iana/const.go b/internal/iana/const.go
index 7692276..1140ed7 100644
--- a/internal/iana/const.go
+++ b/internal/iana/const.go
@@ -2,7 +2,7 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 // Package iana provides protocol number resources managed by the Internet Assigned Numbers Authority (IANA).
-package iana
+package iana // import "golang.org/x/net/internal/iana"
 
 // Differentiated Services Field Codepoints (DSCP), Updated: 2013-06-25
 const (
diff --git a/internal/iana/gen.go b/internal/iana/gen.go
index 7a027ac..d1b42bc 100644
--- a/internal/iana/gen.go
+++ b/internal/iana/gen.go
@@ -46,7 +46,7 @@
 	fmt.Fprintf(&bb, "// go generate gen.go\n")
 	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
 	fmt.Fprintf(&bb, "// Package iana provides protocol number resources managed by the Internet Assigned Numbers Authority (IANA).\n")
-	fmt.Fprintf(&bb, "package iana\n\n")
+	fmt.Fprintf(&bb, `package iana // import "golang.org/x/net/internal/iana"\n\n`)
 	for _, r := range registries {
 		resp, err := http.Get(r.url)
 		if err != nil {
diff --git a/internal/nettest/stack.go b/internal/nettest/stack.go
index 3fac559..e07c015 100644
--- a/internal/nettest/stack.go
+++ b/internal/nettest/stack.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package nettest provides utilities for IP testing.
-package nettest
+package nettest // import "golang.org/x/net/internal/nettest"
 
 import "net"
 
diff --git a/ipv4/doc.go b/ipv4/doc.go
index 3b99aab..688bc8f 100644
--- a/ipv4/doc.go
+++ b/ipv4/doc.go
@@ -234,4 +234,4 @@
 // IGMPv1 or IGMP2 and starts to listen to multicast traffic.
 // In the fallback case, ExcludeSourceSpecificGroup and
 // IncludeSourceSpecificGroup may return an error.
-package ipv4
+package ipv4 // import "golang.org/x/net/ipv4"
diff --git a/ipv6/doc.go b/ipv6/doc.go
index 3f91fa3..6b1b782 100644
--- a/ipv6/doc.go
+++ b/ipv6/doc.go
@@ -231,4 +231,4 @@
 // MLDv1 and starts to listen to multicast traffic.
 // In the fallback case, ExcludeSourceSpecificGroup and
 // IncludeSourceSpecificGroup may return an error.
-package ipv6
+package ipv6 // import "golang.org/x/net/ipv6"
diff --git a/netutil/listen.go b/netutil/listen.go
index a2591f8..b317ba2 100644
--- a/netutil/listen.go
+++ b/netutil/listen.go
@@ -4,7 +4,7 @@
 
 // Package netutil provides network utility functions, complementing the more
 // common ones in the net package.
-package netutil
+package netutil // import "golang.org/x/net/netutil"
 
 import (
 	"net"
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 8ccb0c5..78a8b7b 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -4,7 +4,7 @@
 
 // Package proxy provides support for a variety of protocols to proxy network
 // data.
-package proxy
+package proxy // import "golang.org/x/net/proxy"
 
 import (
 	"errors"
diff --git a/publicsuffix/list.go b/publicsuffix/list.go
index 5e41a65..9419ca9 100644
--- a/publicsuffix/list.go
+++ b/publicsuffix/list.go
@@ -5,7 +5,7 @@
 // Package publicsuffix provides a public suffix list based on data from
 // http://publicsuffix.org/. A public suffix is one under which Internet users
 // can directly register names.
-package publicsuffix
+package publicsuffix // import "golang.org/x/net/publicsuffix"
 
 // TODO: specify case sensitivity and leading/trailing dot behavior for
 // func PublicSuffix and func EffectiveTLDPlusOne.
diff --git a/spdy/types.go b/spdy/types.go
index 7b6ee9c..f0b6d2b 100644
--- a/spdy/types.go
+++ b/spdy/types.go
@@ -4,7 +4,7 @@
 
 // Package spdy implements the SPDY protocol (currently SPDY/3), described in
 // http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3.
-package spdy
+package spdy // import "golang.org/x/net/spdy"
 
 import (
 	"bytes"
diff --git a/webdav/webdav.go b/webdav/webdav.go
index 389512b..8a8f6dc 100644
--- a/webdav/webdav.go
+++ b/webdav/webdav.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package webdav etc etc TODO.
-package webdav
+package webdav // import "golang.org/x/net/webdav"
 
 // TODO: ETag, properties.
 
diff --git a/websocket/websocket.go b/websocket/websocket.go
index 0f4917b..b8d2e6d 100644
--- a/websocket/websocket.go
+++ b/websocket/websocket.go
@@ -4,7 +4,7 @@
 
 // Package websocket implements a client and server for the WebSocket protocol
 // as specified in RFC 6455.
-package websocket
+package websocket // import "golang.org/x/net/websocket"
 
 import (
 	"bufio"