diff --git a/cmd/kubernetes-discovery/discoverysummarizer/doc.go b/cmd/kubernetes-discovery/discoverysummarizer/doc.go
index 1253e049c1f68..87e47d4c40ed5 100644
--- a/cmd/kubernetes-discovery/discoverysummarizer/doc.go
+++ b/cmd/kubernetes-discovery/discoverysummarizer/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package discoverysummarizer contains code for the discovery summarizer
 // (program to summarize discovery information from all federated api servers)
 // as per https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/federated-api-servers.md
-package discoverysummarizer
+package discoverysummarizer // import "k8s.io/kubernetes/cmd/kubernetes-discovery/discoverysummarizer"
diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go
index cab47b2c648c6..0b57778ec5ba7 100644
--- a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go
+++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // +groupName=testgroup.k8s.io
-package testgroup
+package testgroup // import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io"
diff --git a/cmd/libs/go2idl/generator/doc.go b/cmd/libs/go2idl/generator/doc.go
index d912a1a9f428f..a954341c419a9 100644
--- a/cmd/libs/go2idl/generator/doc.go
+++ b/cmd/libs/go2idl/generator/doc.go
@@ -28,4 +28,4 @@ limitations under the License.
 // package. Additionally, all naming systems in the Context will be added as
 // functions to the parsed template, so that they can be called directly from
 // your templates!
-package generator
+package generator // import "k8s.io/kubernetes/cmd/libs/go2idl/generator"
diff --git a/cmd/libs/go2idl/namer/doc.go b/cmd/libs/go2idl/namer/doc.go
index 00467a9db7d7a..0940380660bbd 100644
--- a/cmd/libs/go2idl/namer/doc.go
+++ b/cmd/libs/go2idl/namer/doc.go
@@ -28,4 +28,4 @@ limitations under the License.
 //
 // Additionally, a "RawNamer" can optionally keep track of what needs to be
 // imported.
-package namer
+package namer // import "k8s.io/kubernetes/cmd/libs/go2idl/namer"
diff --git a/cmd/libs/go2idl/parser/doc.go b/cmd/libs/go2idl/parser/doc.go
index 1c9d05c97fef0..4797daacc6dd7 100644
--- a/cmd/libs/go2idl/parser/doc.go
+++ b/cmd/libs/go2idl/parser/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package parser provides code to parse go files, type-check them, extract the
 // types.
-package parser
+package parser // import "k8s.io/kubernetes/cmd/libs/go2idl/parser"
diff --git a/cmd/libs/go2idl/types/doc.go b/cmd/libs/go2idl/types/doc.go
index b5ce9cbec0088..8a5ff0f367b2c 100644
--- a/cmd/libs/go2idl/types/doc.go
+++ b/cmd/libs/go2idl/types/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package types contains go type information, packaged in a way that makes
 // auto-generation convenient, whether by template or straight go functions.
-package types
+package types // import "k8s.io/kubernetes/cmd/libs/go2idl/types"
diff --git a/contrib/mesos/cmd/km/doc.go b/contrib/mesos/cmd/km/doc.go
index 4c5ecaafd37d4..ed0803a912841 100644
--- a/contrib/mesos/cmd/km/doc.go
+++ b/contrib/mesos/cmd/km/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // the upstream hyperkube module is not reusable.
 //
 // TODO(jdef,sttts): refactor upstream cmd/hyperkube to be reusable with the necessary mesos changes
-package main
+package main // import "k8s.io/kubernetes/contrib/mesos/cmd/km"
diff --git a/contrib/mesos/pkg/assert/doc.go b/contrib/mesos/pkg/assert/doc.go
index c8399b85ba39c..43fd0506b98d2 100644
--- a/contrib/mesos/pkg/assert/doc.go
+++ b/contrib/mesos/pkg/assert/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package assert is an utility package containing reusable testing functionality
 // extending github.com/stretchr/testify/assert
-package assert
+package assert // import "k8s.io/kubernetes/contrib/mesos/pkg/assert"
diff --git a/contrib/mesos/pkg/backoff/doc.go b/contrib/mesos/pkg/backoff/doc.go
index 7f5e69401f0e6..ff1a37dd836d4 100644
--- a/contrib/mesos/pkg/backoff/doc.go
+++ b/contrib/mesos/pkg/backoff/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package backoff provides backoff functionality with a simple API.
 // Originally copied from Kubernetes: plugin/pkg/scheduler/factory/factory.go
-package backoff
+package backoff // import "k8s.io/kubernetes/contrib/mesos/pkg/backoff"
diff --git a/contrib/mesos/pkg/controllermanager/doc.go b/contrib/mesos/pkg/controllermanager/doc.go
index f756f9a24d845..2a048806c58e2 100644
--- a/contrib/mesos/pkg/controllermanager/doc.go
+++ b/contrib/mesos/pkg/controllermanager/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package controllermanager is largely a clone of the upstream implementation,
 // with additional functionality to select between stock or a customized
 // endpoints controller.
-package controllermanager
+package controllermanager // import "k8s.io/kubernetes/contrib/mesos/pkg/controllermanager"
diff --git a/contrib/mesos/pkg/election/doc.go b/contrib/mesos/pkg/election/doc.go
index 3e3d09b6debe1..807b9afcd61a8 100644
--- a/contrib/mesos/pkg/election/doc.go
+++ b/contrib/mesos/pkg/election/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package election provides interfaces used for master election.
-package election
+package election // import "k8s.io/kubernetes/contrib/mesos/pkg/election"
diff --git a/contrib/mesos/pkg/executor/config/doc.go b/contrib/mesos/pkg/executor/config/doc.go
index 7c75f34b4e3a2..27994a4b20630 100644
--- a/contrib/mesos/pkg/executor/config/doc.go
+++ b/contrib/mesos/pkg/executor/config/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package config contains executor configuration constants.
-package config
+package config // import "k8s.io/kubernetes/contrib/mesos/pkg/executor/config"
diff --git a/contrib/mesos/pkg/executor/doc.go b/contrib/mesos/pkg/executor/doc.go
index 2e6a92aabfb71..c57252de9ecd5 100644
--- a/contrib/mesos/pkg/executor/doc.go
+++ b/contrib/mesos/pkg/executor/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 Package executor includes a mesos executor, which contains
 a kubelet as its member to manage containers.
 */
-package executor
+package executor // import "k8s.io/kubernetes/contrib/mesos/pkg/executor"
diff --git a/contrib/mesos/pkg/executor/messages/doc.go b/contrib/mesos/pkg/executor/messages/doc.go
index 8e5a4fcefb320..4e3991f09ccb5 100644
--- a/contrib/mesos/pkg/executor/messages/doc.go
+++ b/contrib/mesos/pkg/executor/messages/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package messages exposes executor event/message names as constants.
-package messages
+package messages // import "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages"
diff --git a/contrib/mesos/pkg/executor/service/doc.go b/contrib/mesos/pkg/executor/service/doc.go
index 66f35811a724b..f85f03406e2c9 100644
--- a/contrib/mesos/pkg/executor/service/doc.go
+++ b/contrib/mesos/pkg/executor/service/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package service contains the cmd/k8sm-executor glue code.
-package service
+package service // import "k8s.io/kubernetes/contrib/mesos/pkg/executor/service"
diff --git a/contrib/mesos/pkg/hyperkube/doc.go b/contrib/mesos/pkg/hyperkube/doc.go
index 64150355d186c..307b4387b4f2b 100644
--- a/contrib/mesos/pkg/hyperkube/doc.go
+++ b/contrib/mesos/pkg/hyperkube/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // kubernetes-mesos components into a single binary form, providing a
 // simple mechanism for intra-component discovery as per the original
 // Kubernetes hyperkube package.
-package hyperkube
+package hyperkube // import "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
diff --git a/contrib/mesos/pkg/minion/config/doc.go b/contrib/mesos/pkg/minion/config/doc.go
index 519e7e73dfb00..d16decd683562 100644
--- a/contrib/mesos/pkg/minion/config/doc.go
+++ b/contrib/mesos/pkg/minion/config/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package config contains minion configuration constants.
-package config
+package config // import "k8s.io/kubernetes/contrib/mesos/pkg/minion/config"
diff --git a/contrib/mesos/pkg/minion/doc.go b/contrib/mesos/pkg/minion/doc.go
index df902eda1a106..162694eab2958 100644
--- a/contrib/mesos/pkg/minion/doc.go
+++ b/contrib/mesos/pkg/minion/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package minion contains the executor and proxy bootstrap code for a Mesos slave
-package minion
+package minion // import "k8s.io/kubernetes/contrib/mesos/pkg/minion"
diff --git a/contrib/mesos/pkg/minion/tasks/doc.go b/contrib/mesos/pkg/minion/tasks/doc.go
index 4e0ab9e6fbe4f..6577105a05ce3 100644
--- a/contrib/mesos/pkg/minion/tasks/doc.go
+++ b/contrib/mesos/pkg/minion/tasks/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package tasks provides an API for supervising system processes as Task's.
 // It provides stronger guarantees with respect to process lifecycle than a
 // standalone kubelet running static pods.
-package tasks
+package tasks // import "k8s.io/kubernetes/contrib/mesos/pkg/minion/tasks"
diff --git a/contrib/mesos/pkg/node/doc.go b/contrib/mesos/pkg/node/doc.go
index 7ace17e446de3..9d57176ee6757 100644
--- a/contrib/mesos/pkg/node/doc.go
+++ b/contrib/mesos/pkg/node/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package node provides utilities to create and update nodes
-package node
+package node // import "k8s.io/kubernetes/contrib/mesos/pkg/node"
diff --git a/contrib/mesos/pkg/offers/doc.go b/contrib/mesos/pkg/offers/doc.go
index bc8130ea1704e..f48d2c8cd6797 100644
--- a/contrib/mesos/pkg/offers/doc.go
+++ b/contrib/mesos/pkg/offers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package offers contains code that manages Mesos offers.
-package offers
+package offers // import "k8s.io/kubernetes/contrib/mesos/pkg/offers"
diff --git a/contrib/mesos/pkg/offers/metrics/doc.go b/contrib/mesos/pkg/offers/metrics/doc.go
index 074d2b5f42d00..ff2ea8da4e315 100644
--- a/contrib/mesos/pkg/offers/metrics/doc.go
+++ b/contrib/mesos/pkg/offers/metrics/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package metrics defines and exposes instrumentation metrics related to
 // Mesos offers.
-package metrics
+package metrics // import "k8s.io/kubernetes/contrib/mesos/pkg/offers/metrics"
diff --git a/contrib/mesos/pkg/podutil/doc.go b/contrib/mesos/pkg/podutil/doc.go
index 05cd32288afc0..76d9e9417a49f 100644
--- a/contrib/mesos/pkg/podutil/doc.go
+++ b/contrib/mesos/pkg/podutil/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // podutil contains utilities for reading, writing and filtering streams
 // and lists of api.Pod objects.
-package podutil
+package podutil // import "k8s.io/kubernetes/contrib/mesos/pkg/podutil"
diff --git a/contrib/mesos/pkg/proc/doc.go b/contrib/mesos/pkg/proc/doc.go
index a11b8f8c8218c..75a9328009196 100644
--- a/contrib/mesos/pkg/proc/doc.go
+++ b/contrib/mesos/pkg/proc/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package proc provides opinionated utilities for processing background
 // operations and future errors, somewhat inspired by libprocess.
-package proc
+package proc // import "k8s.io/kubernetes/contrib/mesos/pkg/proc"
diff --git a/contrib/mesos/pkg/profile/doc.go b/contrib/mesos/pkg/profile/doc.go
index e5ef6e4452257..77d1eaa56710b 100644
--- a/contrib/mesos/pkg/profile/doc.go
+++ b/contrib/mesos/pkg/profile/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package profile contains reusable code for profiling Go programs with pprof.
-package profile
+package profile // import "k8s.io/kubernetes/contrib/mesos/pkg/profile"
diff --git a/contrib/mesos/pkg/queue/doc.go b/contrib/mesos/pkg/queue/doc.go
index 898d65b31320c..5494b799ecb77 100644
--- a/contrib/mesos/pkg/queue/doc.go
+++ b/contrib/mesos/pkg/queue/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package queue provides several queue implementations, originally
 // inspired by Kubernetes pkg/client/cache/fifo.
-package queue
+package queue // import "k8s.io/kubernetes/contrib/mesos/pkg/queue"
diff --git a/contrib/mesos/pkg/redirfd/doc.go b/contrib/mesos/pkg/redirfd/doc.go
index 7158341dc53ac..784782e5f5683 100644
--- a/contrib/mesos/pkg/redirfd/doc.go
+++ b/contrib/mesos/pkg/redirfd/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Some file descriptor manipulation funcs (Unix-Only), inspired by
 // https://github.com/skarnet/execline/blob/master/src/execline/redirfd.c
-package redirfd
+package redirfd // import "k8s.io/kubernetes/contrib/mesos/pkg/redirfd"
diff --git a/contrib/mesos/pkg/runtime/doc.go b/contrib/mesos/pkg/runtime/doc.go
index 89ba07be02d2d..e65767f347a62 100644
--- a/contrib/mesos/pkg/runtime/doc.go
+++ b/contrib/mesos/pkg/runtime/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package runtime provides utilities for semaphores (chan struct{}),
 // a simple Latch implementation, and metrics for reporting handled panics.
-package runtime
+package runtime // import "k8s.io/kubernetes/contrib/mesos/pkg/runtime"
diff --git a/contrib/mesos/pkg/scheduler/components/algorithm/doc.go b/contrib/mesos/pkg/scheduler/components/algorithm/doc.go
index 1607a6bad9a66..7f805e59f9f73 100644
--- a/contrib/mesos/pkg/scheduler/components/algorithm/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/algorithm/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package algorithm implements the SchedulerAlgorithm
-package algorithm
+package algorithm // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm"
diff --git a/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers/doc.go b/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers/doc.go
index 080d3cd4d9223..99f0fa5beb4ab 100644
--- a/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package podschedulers defines an interface (w/ implementations) for matching
 // pods against offers.
-package podschedulers
+package podschedulers // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers"
diff --git a/contrib/mesos/pkg/scheduler/components/binder/doc.go b/contrib/mesos/pkg/scheduler/components/binder/doc.go
index 39d0670c299a0..57d9626454807 100644
--- a/contrib/mesos/pkg/scheduler/components/binder/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/binder/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package binder implements the Binder which launched a task and let the
 // executor do the actual binding.
-package binder
+package binder // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/binder"
diff --git a/contrib/mesos/pkg/scheduler/components/controller/doc.go b/contrib/mesos/pkg/scheduler/components/controller/doc.go
index a9313fb87addb..9e75d47bb354e 100644
--- a/contrib/mesos/pkg/scheduler/components/controller/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/controller/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package controller implements the scheduling controller which waits for pod
 // events from the queuer (i.e. from the apiserver), passes them to the
 // SchedulerAlgorithm and in case of success to the binder which does the launch.
-package controller
+package controller // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/controller"
diff --git a/contrib/mesos/pkg/scheduler/components/deleter/doc.go b/contrib/mesos/pkg/scheduler/components/deleter/doc.go
index d9c667f95384d..045457e68c5b2 100644
--- a/contrib/mesos/pkg/scheduler/components/deleter/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/deleter/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package deleter implements the deleter which listens for pod DELETE events
 // from the apiserver and kills tasks for deleted pods.
-package deleter
+package deleter // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/deleter"
diff --git a/contrib/mesos/pkg/scheduler/components/doc.go b/contrib/mesos/pkg/scheduler/components/doc.go
index 397e7df926dd2..38aa33f93ca85 100644
--- a/contrib/mesos/pkg/scheduler/components/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package components implements independent aspects of the scheduler which
 // do not use Framework or Scheduler internals, but rely solely on the Scheduler
 // interface.
-package components
+package components // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components"
diff --git a/contrib/mesos/pkg/scheduler/components/errorhandler/doc.go b/contrib/mesos/pkg/scheduler/components/errorhandler/doc.go
index acb8a6e318dbd..42c8c91ccda14 100644
--- a/contrib/mesos/pkg/scheduler/components/errorhandler/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/errorhandler/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package errorhandler implements the ErrorHandler which handles scheduer error
 // and possibly requeue pods for scheduling again.
-package errorhandler
+package errorhandler // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/errorhandler"
diff --git a/contrib/mesos/pkg/scheduler/components/framework/doc.go b/contrib/mesos/pkg/scheduler/components/framework/doc.go
index 5a1d0b077ed2b..659534d05b7c6 100644
--- a/contrib/mesos/pkg/scheduler/components/framework/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/framework/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package framework implements the Mesos scheduler.
-package framework
+package framework // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/framework"
diff --git a/contrib/mesos/pkg/scheduler/components/podreconciler/doc.go b/contrib/mesos/pkg/scheduler/components/podreconciler/doc.go
index e0ded3bcb3004..3afc07ef13f34 100644
--- a/contrib/mesos/pkg/scheduler/components/podreconciler/doc.go
+++ b/contrib/mesos/pkg/scheduler/components/podreconciler/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package podreconciler implements pod reconciliation of pods which failed
 // to launch, i.e. before binding by the executor took place.
-package podreconciler
+package podreconciler // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/podreconciler"
diff --git a/contrib/mesos/pkg/scheduler/config/doc.go b/contrib/mesos/pkg/scheduler/config/doc.go
index 100d3365a37eb..a0b0a57cf3a50 100644
--- a/contrib/mesos/pkg/scheduler/config/doc.go
+++ b/contrib/mesos/pkg/scheduler/config/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package config provides mechanisms for low-level scheduler tuning.
-package config
+package config // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config"
diff --git a/contrib/mesos/pkg/scheduler/constraint/doc.go b/contrib/mesos/pkg/scheduler/constraint/doc.go
index 729a1404b46f1..875a0a1d579eb 100644
--- a/contrib/mesos/pkg/scheduler/constraint/doc.go
+++ b/contrib/mesos/pkg/scheduler/constraint/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // Incomplete.
 // TODO(jdef) We need better alignment between k8s-mesos and k8s scheduling
 // constraints (read: a common constraints API).
-package constraint
+package constraint // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/constraint"
diff --git a/contrib/mesos/pkg/scheduler/doc.go b/contrib/mesos/pkg/scheduler/doc.go
index 22f75684f2ee4..44ece764c3845 100644
--- a/contrib/mesos/pkg/scheduler/doc.go
+++ b/contrib/mesos/pkg/scheduler/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package scheduler implements the Kubernetes Mesos scheduler.
-package scheduler
+package scheduler // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 
 // Created from contrib/mesos/docs/scheduler.monopic:
 //
diff --git a/contrib/mesos/pkg/scheduler/errors/doc.go b/contrib/mesos/pkg/scheduler/errors/doc.go
index 760647f91c752..ebf501a950901 100644
--- a/contrib/mesos/pkg/scheduler/errors/doc.go
+++ b/contrib/mesos/pkg/scheduler/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors contains all scheduler wide used errors
-package errors
+package errors // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
diff --git a/contrib/mesos/pkg/scheduler/executorinfo/doc.go b/contrib/mesos/pkg/scheduler/executorinfo/doc.go
index 8c248e344ed43..0190f01ba91c4 100644
--- a/contrib/mesos/pkg/scheduler/executorinfo/doc.go
+++ b/contrib/mesos/pkg/scheduler/executorinfo/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package executorinfo provides a lru-based executor info registry
 // as well as some utility methods.
-package executorinfo
+package executorinfo // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/executorinfo"
diff --git a/contrib/mesos/pkg/scheduler/ha/doc.go b/contrib/mesos/pkg/scheduler/ha/doc.go
index 1b7b62aad56ec..22af767b13baf 100644
--- a/contrib/mesos/pkg/scheduler/ha/doc.go
+++ b/contrib/mesos/pkg/scheduler/ha/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package ha encapsulates high-availability scheduler concerns.
-package ha
+package ha // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha"
diff --git a/contrib/mesos/pkg/scheduler/integration/doc.go b/contrib/mesos/pkg/scheduler/integration/doc.go
index d45259af4b7eb..3efed18fbaed6 100644
--- a/contrib/mesos/pkg/scheduler/integration/doc.go
+++ b/contrib/mesos/pkg/scheduler/integration/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package integration implements integration tests.
-package integration
+package integration // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/integration"
diff --git a/contrib/mesos/pkg/scheduler/meta/doc.go b/contrib/mesos/pkg/scheduler/meta/doc.go
index d8082743a57f8..f0a66ed324e5d 100644
--- a/contrib/mesos/pkg/scheduler/meta/doc.go
+++ b/contrib/mesos/pkg/scheduler/meta/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // for reconciliation upon failover. Other annotations are used as part of
 // the host-to-pod port-mapping implementation understood by the k8s-mesos
 // scheduler and custom endpoints-controller implementation.
-package meta
+package meta // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
diff --git a/contrib/mesos/pkg/scheduler/metrics/doc.go b/contrib/mesos/pkg/scheduler/metrics/doc.go
index 7315f010a0669..4b07fe696ec8b 100644
--- a/contrib/mesos/pkg/scheduler/metrics/doc.go
+++ b/contrib/mesos/pkg/scheduler/metrics/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package metrics defines and exposes instrumentation metrics of the scheduler.
-package metrics
+package metrics // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics"
diff --git a/contrib/mesos/pkg/scheduler/podtask/doc.go b/contrib/mesos/pkg/scheduler/podtask/doc.go
index 2f0ee8de96666..d0007da970b20 100644
--- a/contrib/mesos/pkg/scheduler/podtask/doc.go
+++ b/contrib/mesos/pkg/scheduler/podtask/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package podtask maps Kubernetes pods to Mesos tasks.
-package podtask
+package podtask // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
diff --git a/contrib/mesos/pkg/scheduler/queuer/doc.go b/contrib/mesos/pkg/scheduler/queuer/doc.go
index 15fb20ccf5a3e..dc386c955c3f8 100644
--- a/contrib/mesos/pkg/scheduler/queuer/doc.go
+++ b/contrib/mesos/pkg/scheduler/queuer/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package queuer implements a Pod Queuer which stores and yields pods waiting
 // being scheduled.
-package queuer
+package queuer // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
diff --git a/contrib/mesos/pkg/scheduler/resources/doc.go b/contrib/mesos/pkg/scheduler/resources/doc.go
index df91010411c6e..56a97b7a5588e 100644
--- a/contrib/mesos/pkg/scheduler/resources/doc.go
+++ b/contrib/mesos/pkg/scheduler/resources/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package resources contains the Mesos scheduler specific resource functions
-package resources
+package resources // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resources"
diff --git a/contrib/mesos/pkg/scheduler/service/doc.go b/contrib/mesos/pkg/scheduler/service/doc.go
index 21a8e69602af2..159c22edf51fe 100644
--- a/contrib/mesos/pkg/scheduler/service/doc.go
+++ b/contrib/mesos/pkg/scheduler/service/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package service contains the cmd/k8sm-scheduler glue code
-package service
+package service // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service"
diff --git a/contrib/mesos/pkg/service/doc.go b/contrib/mesos/pkg/service/doc.go
index 6de20a474a9e8..27b009bb4a968 100644
--- a/contrib/mesos/pkg/service/doc.go
+++ b/contrib/mesos/pkg/service/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package service is largely a clone of the stock Kubernetes endpoints
 // controller, extended with some very specific functionality related
 // to kubernetes-mesos specific host-pod port mapping.
-package service
+package service // import "k8s.io/kubernetes/contrib/mesos/pkg/service"
diff --git a/examples/doc.go b/examples/doc.go
index 06a770bdf6f5a..85b3b214b835c 100644
--- a/examples/doc.go
+++ b/examples/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Examples contains sample applications for trying out the concepts in Kubernetes.
-package examples
+package examples // import "k8s.io/kubernetes/examples"
diff --git a/federation/apis/federation/doc.go b/federation/apis/federation/doc.go
index 7a45fb7bb8ca2..4c51dfeebefc6 100644
--- a/federation/apis/federation/doc.go
+++ b/federation/apis/federation/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package federation
+package federation // import "k8s.io/kubernetes/federation/apis/federation"
diff --git a/federation/apis/federation/v1beta1/doc.go b/federation/apis/federation/v1beta1/doc.go
index 3a4f89c982eb8..63a9aac120af0 100644
--- a/federation/apis/federation/v1beta1/doc.go
+++ b/federation/apis/federation/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/federation/apis/federation
 
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/federation/apis/federation/v1beta1"
diff --git a/federation/client/clientset_generated/federation_release_1_3/doc.go b/federation/client/clientset_generated/federation_release_1_3/doc.go
index 3144022350c15..17df62cf0f4a6 100644
--- a/federation/client/clientset_generated/federation_release_1_3/doc.go
+++ b/federation/client/clientset_generated/federation_release_1_3/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1]
 
 // This package has the automatically generated clientset.
-package federation_release_1_3
+package federation_release_1_3 // import "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3"
diff --git a/federation/client/clientset_generated/federation_release_1_3/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/fake/doc.go
index 70d4cc4da47e0..02988e06facc5 100644
--- a/federation/client/clientset_generated/federation_release_1_3/fake/doc.go
+++ b/federation/client/clientset_generated/federation_release_1_3/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1]
 
 // This package has the automatically generated fake clientset.
-package fake
+package fake // import "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/fake"
diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go
index cd17626fb85be..1a7cd1ee04bb5 100644
--- a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go
+++ b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1]
 
 // This package has the automatically generated typed clients.
-package v1
+package v1 // import "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/core/v1"
diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go
index 0fe7d81cb4b68..b0afa8a3d8f70 100644
--- a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go
+++ b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/fake"
diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go
index 8952b757b317f..4d83dddf2a32d 100644
--- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go
+++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1]
 
 // This package has the automatically generated typed clients.
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1"
diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go
index 0fe7d81cb4b68..45e7c94feab2d 100644
--- a/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go
+++ b/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=federation_release_1_3 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/v1/Service] --input=[../../federation/apis/federation/v1beta1,api/v1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3/typed/federation/v1beta1/fake"
diff --git a/federation/pkg/dnsprovider/doc.go b/federation/pkg/dnsprovider/doc.go
index 9012e3f76e1d2..201c57a0502c9 100644
--- a/federation/pkg/dnsprovider/doc.go
+++ b/federation/pkg/dnsprovider/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 dnsprovider supplies interfaces for dns service providers (e.g. Google Cloud DNS, AWS route53, etc).
 Implementations exist in the providers sub-package
 */
-package dnsprovider
+package dnsprovider // import "k8s.io/kubernetes/federation/pkg/dnsprovider"
diff --git a/federation/pkg/federation-controller/cluster/doc.go b/federation/pkg/federation-controller/cluster/doc.go
index 4b5f8ef723b97..d311db09456a4 100644
--- a/federation/pkg/federation-controller/cluster/doc.go
+++ b/federation/pkg/federation-controller/cluster/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package cluster contains code for syncing cluster
-package cluster
+package cluster // import "k8s.io/kubernetes/federation/pkg/federation-controller/cluster"
diff --git a/federation/pkg/federation-controller/doc.go b/federation/pkg/federation-controller/doc.go
index b2c33f1a8c937..657ce63c1eb0c 100644
--- a/federation/pkg/federation-controller/doc.go
+++ b/federation/pkg/federation-controller/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package federation_controller contains code for controllers (like the cluster
 // controller).
-package federation_controller
+package federation_controller // import "k8s.io/kubernetes/federation/pkg/federation-controller"
diff --git a/federation/pkg/federation-controller/service/doc.go b/federation/pkg/federation-controller/service/doc.go
index 97063051a16fc..a346ef6f44b41 100644
--- a/federation/pkg/federation-controller/service/doc.go
+++ b/federation/pkg/federation-controller/service/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service contains code for syncing Kubernetes services,
 // and cloud DNS servers with the federated service registry.
-package service
+package service // import "k8s.io/kubernetes/federation/pkg/federation-controller/service"
diff --git a/pkg/api/annotations/doc.go b/pkg/api/annotations/doc.go
index 0c36c85cc17f4..2978b22788491 100644
--- a/pkg/api/annotations/doc.go
+++ b/pkg/api/annotations/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package annotations defines annotation keys that shared between server and client
-package annotations
+package annotations // import "k8s.io/kubernetes/pkg/api/annotations"
diff --git a/pkg/api/doc.go b/pkg/api/doc.go
index 1507a8823b4c8..283a83e402df6 100644
--- a/pkg/api/doc.go
+++ b/pkg/api/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // The contract presented to clients is located in the versioned packages,
 // which are sub-directories. The first one is "v1". Those packages
 // describe how a particular version is serialized to storage/network.
-package api
+package api // import "k8s.io/kubernetes/pkg/api"
diff --git a/pkg/api/errors/doc.go b/pkg/api/errors/doc.go
index 58751ed0ec87a..0929d746c2f8f 100644
--- a/pkg/api/errors/doc.go
+++ b/pkg/api/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors provides detailed error types for api field validation.
-package errors
+package errors // import "k8s.io/kubernetes/pkg/api/errors"
diff --git a/pkg/api/errors/storage/doc.go b/pkg/api/errors/storage/doc.go
index 4c26011954669..7655da4d841f7 100644
--- a/pkg/api/errors/storage/doc.go
+++ b/pkg/api/errors/storage/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package etcd provides conversion of etcd errors to API errors.
-package storage
+package storage // import "k8s.io/kubernetes/pkg/api/errors/storage"
diff --git a/pkg/api/meta/doc.go b/pkg/api/meta/doc.go
index a3b18a5c9aa10..50007adbbb914 100644
--- a/pkg/api/meta/doc.go
+++ b/pkg/api/meta/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package meta provides functions for retrieving API metadata from objects
 // belonging to the Kubernetes API
-package meta
+package meta // import "k8s.io/kubernetes/pkg/api/meta"
diff --git a/pkg/api/rest/doc.go b/pkg/api/rest/doc.go
index ee7c4145f4d20..97d4b9a0acce3 100644
--- a/pkg/api/rest/doc.go
+++ b/pkg/api/rest/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package rest defines common logic around changes to Kubernetes resources.
-package rest
+package rest // import "k8s.io/kubernetes/pkg/api/rest"
diff --git a/pkg/api/unversioned/doc.go b/pkg/api/unversioned/doc.go
index d0ffc33275ff4..afb2391acde62 100644
--- a/pkg/api/unversioned/doc.go
+++ b/pkg/api/unversioned/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 
-package unversioned
+package unversioned // import "k8s.io/kubernetes/pkg/api/unversioned"
diff --git a/pkg/api/v1/doc.go b/pkg/api/v1/doc.go
index 8849ee1cb13d2..10dc479a3c9e2 100644
--- a/pkg/api/v1/doc.go
+++ b/pkg/api/v1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/api
 
 // Package v1 is the v1 version of the API.
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/api/v1"
diff --git a/pkg/api/validation/doc.go b/pkg/api/validation/doc.go
index f17a15cf9c1d8..30f541de32bbc 100644
--- a/pkg/api/validation/doc.go
+++ b/pkg/api/validation/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package validation has functions for validating the correctness of api
 // objects and explaining what is wrong with them when they aren't valid.
-package validation
+package validation // import "k8s.io/kubernetes/pkg/api/validation"
diff --git a/pkg/apimachinery/doc.go b/pkg/apimachinery/doc.go
index ede22b3d68510..9a40e426b4c83 100644
--- a/pkg/apimachinery/doc.go
+++ b/pkg/apimachinery/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package apimachinery contains the generic API machinery code that
 // is common to both server and clients.
 // This package should never import specific API objects.
-package apimachinery
+package apimachinery // import "k8s.io/kubernetes/pkg/apimachinery"
diff --git a/pkg/apis/apps/doc.go b/pkg/apis/apps/doc.go
index bca1ff4ef0136..e216ed6fd8d9f 100644
--- a/pkg/apis/apps/doc.go
+++ b/pkg/apis/apps/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package apps
+package apps // import "k8s.io/kubernetes/pkg/apis/apps"
diff --git a/pkg/apis/apps/v1alpha1/doc.go b/pkg/apis/apps/v1alpha1/doc.go
index 53d9fcabc418f..1b6819c2a97d5 100644
--- a/pkg/apis/apps/v1alpha1/doc.go
+++ b/pkg/apis/apps/v1alpha1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/apps
 
-package v1alpha1
+package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/apps/v1alpha1"
diff --git a/pkg/apis/authentication.k8s.io/doc.go b/pkg/apis/authentication.k8s.io/doc.go
index 66c5ae720c052..855336d50fbc0 100644
--- a/pkg/apis/authentication.k8s.io/doc.go
+++ b/pkg/apis/authentication.k8s.io/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package authentication
+package authentication // import "k8s.io/kubernetes/pkg/apis/authentication.k8s.io"
diff --git a/pkg/apis/authentication.k8s.io/v1beta1/doc.go b/pkg/apis/authentication.k8s.io/v1beta1/doc.go
index 25b76fd347f60..ce87bc9c26a89 100644
--- a/pkg/apis/authentication.k8s.io/v1beta1/doc.go
+++ b/pkg/apis/authentication.k8s.io/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authentication.k8s.io
 
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/pkg/apis/authentication.k8s.io/v1beta1"
diff --git a/pkg/apis/authorization/doc.go b/pkg/apis/authorization/doc.go
index 9660e5eacf903..4cf28cad849e4 100644
--- a/pkg/apis/authorization/doc.go
+++ b/pkg/apis/authorization/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package authorization
+package authorization // import "k8s.io/kubernetes/pkg/apis/authorization"
diff --git a/pkg/apis/authorization/v1beta1/doc.go b/pkg/apis/authorization/v1beta1/doc.go
index a6f2c27b10e74..f5c4cbc2a1f0f 100644
--- a/pkg/apis/authorization/v1beta1/doc.go
+++ b/pkg/apis/authorization/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authorization
 
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
diff --git a/pkg/apis/autoscaling/doc.go b/pkg/apis/autoscaling/doc.go
index 2c770186ba76f..d9e11576f92f7 100644
--- a/pkg/apis/autoscaling/doc.go
+++ b/pkg/apis/autoscaling/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package autoscaling
+package autoscaling // import "k8s.io/kubernetes/pkg/apis/autoscaling"
diff --git a/pkg/apis/autoscaling/v1/doc.go b/pkg/apis/autoscaling/v1/doc.go
index be1c70fdb5a7e..5ce82c9639042 100644
--- a/pkg/apis/autoscaling/v1/doc.go
+++ b/pkg/apis/autoscaling/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
 
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
diff --git a/pkg/apis/batch/doc.go b/pkg/apis/batch/doc.go
index c6b203cd8ebe8..9b2b792bd5116 100644
--- a/pkg/apis/batch/doc.go
+++ b/pkg/apis/batch/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package batch
+package batch // import "k8s.io/kubernetes/pkg/apis/batch"
diff --git a/pkg/apis/batch/v1/doc.go b/pkg/apis/batch/v1/doc.go
index 5695b9e4022bc..31a944c401e3c 100644
--- a/pkg/apis/batch/v1/doc.go
+++ b/pkg/apis/batch/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
 
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/apis/batch/v1"
diff --git a/pkg/apis/batch/v2alpha1/doc.go b/pkg/apis/batch/v2alpha1/doc.go
index 76b5d325131b8..2b2d603145c54 100644
--- a/pkg/apis/batch/v2alpha1/doc.go
+++ b/pkg/apis/batch/v2alpha1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
 
-package v2alpha1
+package v2alpha1 // import "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
diff --git a/pkg/apis/certificates/doc.go b/pkg/apis/certificates/doc.go
index d2897cb87d7c9..908fda8c0c6a7 100644
--- a/pkg/apis/certificates/doc.go
+++ b/pkg/apis/certificates/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package certificates
+package certificates // import "k8s.io/kubernetes/pkg/apis/certificates"
diff --git a/pkg/apis/certificates/v1alpha1/doc.go b/pkg/apis/certificates/v1alpha1/doc.go
index 3528c164f9aae..3063ec00aa633 100644
--- a/pkg/apis/certificates/v1alpha1/doc.go
+++ b/pkg/apis/certificates/v1alpha1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates
 
-package v1alpha1
+package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1"
diff --git a/pkg/apis/componentconfig/doc.go b/pkg/apis/componentconfig/doc.go
index d044b16db3910..8fe8d52edcb42 100644
--- a/pkg/apis/componentconfig/doc.go
+++ b/pkg/apis/componentconfig/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package componentconfig
+package componentconfig // import "k8s.io/kubernetes/pkg/apis/componentconfig"
diff --git a/pkg/apis/componentconfig/v1alpha1/doc.go b/pkg/apis/componentconfig/v1alpha1/doc.go
index 621e80613d1c2..0ae8b2a9998c6 100644
--- a/pkg/apis/componentconfig/v1alpha1/doc.go
+++ b/pkg/apis/componentconfig/v1alpha1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/componentconfig
 
-package v1alpha1
+package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
diff --git a/pkg/apis/extensions/doc.go b/pkg/apis/extensions/doc.go
index 2bbb71d0571dc..fbce8ee707d72 100644
--- a/pkg/apis/extensions/doc.go
+++ b/pkg/apis/extensions/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package extensions
+package extensions // import "k8s.io/kubernetes/pkg/apis/extensions"
diff --git a/pkg/apis/extensions/v1beta1/doc.go b/pkg/apis/extensions/v1beta1/doc.go
index dc8790024d9cb..bd4087f6b2ac6 100644
--- a/pkg/apis/extensions/v1beta1/doc.go
+++ b/pkg/apis/extensions/v1beta1/doc.go
@@ -19,4 +19,4 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
 
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
diff --git a/pkg/apis/policy/doc.go b/pkg/apis/policy/doc.go
index 876858cd9a760..86f4cd5607928 100644
--- a/pkg/apis/policy/doc.go
+++ b/pkg/apis/policy/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 
-package policy
+package policy // import "k8s.io/kubernetes/pkg/apis/policy"
diff --git a/pkg/apis/policy/v1alpha1/doc.go b/pkg/apis/policy/v1alpha1/doc.go
index 985d4bbf071ad..8bd6c3a522e34 100644
--- a/pkg/apis/policy/v1alpha1/doc.go
+++ b/pkg/apis/policy/v1alpha1/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,
 // NetworkPolicy, etc.
-package v1alpha1
+package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/policy/v1alpha1"
diff --git a/pkg/apis/rbac/doc.go b/pkg/apis/rbac/doc.go
index e4ce69b40b94e..ac9920c60731f 100644
--- a/pkg/apis/rbac/doc.go
+++ b/pkg/apis/rbac/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 
 // +groupName=rbac.authorization.k8s.io
-package rbac
+package rbac // import "k8s.io/kubernetes/pkg/apis/rbac"
diff --git a/pkg/apis/rbac/v1alpha1/doc.go b/pkg/apis/rbac/v1alpha1/doc.go
index e471bd384bffb..86ddb241afd60 100644
--- a/pkg/apis/rbac/v1alpha1/doc.go
+++ b/pkg/apis/rbac/v1alpha1/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/rbac
 
-package v1alpha1
+package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
diff --git a/pkg/apiserver/doc.go b/pkg/apiserver/doc.go
index df1224d97133a..c02919ecd694e 100644
--- a/pkg/apiserver/doc.go
+++ b/pkg/apiserver/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package apiserver contains the code that provides a rest.ful api service.
-package apiserver
+package apiserver // import "k8s.io/kubernetes/pkg/apiserver"
diff --git a/pkg/auth/user/doc.go b/pkg/auth/user/doc.go
index 570c51ae995d9..589656f0c5d92 100644
--- a/pkg/auth/user/doc.go
+++ b/pkg/auth/user/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package user contains utilities for dealing with simple user exchange in the auth
 // packages. The user.Info interface defines an interface for exchanging that info.
-package user
+package user // import "k8s.io/kubernetes/pkg/auth/user"
diff --git a/pkg/capabilities/doc.go b/pkg/capabilities/doc.go
index e2042a881e9f5..bbdc89d50794d 100644
--- a/pkg/capabilities/doc.go
+++ b/pkg/capabilities/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // package capabilities manages system level capabilities
-package capabilities
+package capabilities // import "k8s.io/kubernetes/pkg/capabilities"
diff --git a/pkg/client/cache/doc.go b/pkg/client/cache/doc.go
index 4f593f0d3d8a6..67dd3dd4598ce 100644
--- a/pkg/client/cache/doc.go
+++ b/pkg/client/cache/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // list currently available nodes), and one that additionally acts as
 // a FIFO queue (for example, to allow a scheduler to process incoming
 // pods).
-package cache
+package cache // import "k8s.io/kubernetes/pkg/client/cache"
diff --git a/pkg/client/clientset_generated/release_1_2/doc.go b/pkg/client/clientset_generated/release_1_2/doc.go
index ed48f89e09b1d..71c2705bbfacc 100644
--- a/pkg/client/clientset_generated/release_1_2/doc.go
+++ b/pkg/client/clientset_generated/release_1_2/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1]
 
 // This package has the automatically generated clientset.
-package release_1_2
+package release_1_2 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
diff --git a/pkg/client/clientset_generated/release_1_2/fake/doc.go b/pkg/client/clientset_generated/release_1_2/fake/doc.go
index d96913b68b84d..388278d804cfa 100644
--- a/pkg/client/clientset_generated/release_1_2/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_2/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1]
 
 // This package has the automatically generated fake clientset.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/fake"
diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go b/pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go
index 4789199936a61..a866884fea72e 100644
--- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go
+++ b/pkg/client/clientset_generated/release_1_2/typed/core/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1]
 
 // This package has the automatically generated typed clients.
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1"
diff --git a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go
index 66ed21840a8e5..70b6552f4a801 100644
--- a/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1/fake"
diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go
index 6f1bcd0536960..c83ebdfbce60c 100644
--- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go
+++ b/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1]
 
 // This package has the automatically generated typed clients.
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1"
diff --git a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go
index 66ed21840a8e5..b125a4bfbe556 100644
--- a/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_2 --input=[api/v1,extensions/v1beta1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1/fake"
diff --git a/pkg/client/clientset_generated/release_1_3/doc.go b/pkg/client/clientset_generated/release_1_3/doc.go
index 9d023967a1a5e..24de5bd8ef68e 100644
--- a/pkg/client/clientset_generated/release_1_3/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // This package has the automatically generated clientset.
-package release_1_3
+package release_1_3 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
diff --git a/pkg/client/clientset_generated/release_1_3/fake/doc.go b/pkg/client/clientset_generated/release_1_3/fake/doc.go
index 3dced25a39ccf..f9466ced4b58b 100644
--- a/pkg/client/clientset_generated/release_1_3/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // This package has the automatically generated fake clientset.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/fake"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/doc.go b/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/doc.go
index b9083ab35f1ec..8dba6396bd232 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // This package has the automatically generated typed clients.
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/fake/doc.go
index 3847506040aeb..bd5a40aec3bbb 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/fake"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/batch/v1/doc.go b/pkg/client/clientset_generated/release_1_3/typed/batch/v1/doc.go
index b9083ab35f1ec..e0b05c498cedf 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/batch/v1/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/batch/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // This package has the automatically generated typed clients.
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/batch/v1"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/batch/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_3/typed/batch/v1/fake/doc.go
index 3847506040aeb..7c56ed38a7db7 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/batch/v1/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/batch/v1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/batch/v1/fake"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/core/v1/doc.go b/pkg/client/clientset_generated/release_1_3/typed/core/v1/doc.go
index b9083ab35f1ec..c6c71694ac81e 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/core/v1/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/core/v1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // This package has the automatically generated typed clients.
-package v1
+package v1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/core/v1"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/core/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_3/typed/core/v1/fake/doc.go
index 3847506040aeb..fcd8ba0b9f1ee 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/core/v1/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/core/v1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/core/v1/fake"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/doc.go
index 84e91d2db693b..4394e4dd8a204 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // This package has the automatically generated typed clients.
-package v1beta1
+package v1beta1 // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1"
diff --git a/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/fake/doc.go
index 3847506040aeb..2a0755db6405d 100644
--- a/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/fake/doc.go
+++ b/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/fake/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // This package is generated by client-gen with arguments: --clientset-name=release_1_3 --input=[api/v1,extensions/v1beta1,autoscaling/v1,batch/v1]
 
 // Package fake has the automatically generated clients.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/fake"
diff --git a/pkg/client/record/doc.go b/pkg/client/record/doc.go
index 0dc790696fb87..4c1fbaff390b1 100644
--- a/pkg/client/record/doc.go
+++ b/pkg/client/record/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package record has all client logic for recording and reporting events.
-package record
+package record // import "k8s.io/kubernetes/pkg/client/record"
diff --git a/pkg/client/unversioned/clientcmd/doc.go b/pkg/client/unversioned/clientcmd/doc.go
index 30ef6f36daf9c..b5261697ba871 100644
--- a/pkg/client/unversioned/clientcmd/doc.go
+++ b/pkg/client/unversioned/clientcmd/doc.go
@@ -34,4 +34,4 @@ Sample usage from merged .kubeconfig files (local directory, home directory)
 	client, err := unversioned.New(config)
 	// ...
 */
-package clientcmd
+package clientcmd // import "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
diff --git a/pkg/client/unversioned/doc.go b/pkg/client/unversioned/doc.go
index dac3925b4afb5..41cd0e0252467 100644
--- a/pkg/client/unversioned/doc.go
+++ b/pkg/client/unversioned/doc.go
@@ -54,4 +54,4 @@ The RESTClient type implements the Kubernetes API conventions (see `docs/devel/a
 for a given API path and is intended for use by consumers implementing their own Kubernetes
 compatible APIs.
 */
-package unversioned
+package unversioned // import "k8s.io/kubernetes/pkg/client/unversioned"
diff --git a/pkg/client/unversioned/portforward/doc.go b/pkg/client/unversioned/portforward/doc.go
index e0f6cfbf2bec1..c05f82b0f24aa 100644
--- a/pkg/client/unversioned/portforward/doc.go
+++ b/pkg/client/unversioned/portforward/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package portforward adds support for SSH-like port forwarding from the client's
 // local host to remote containers.
-package portforward
+package portforward // import "k8s.io/kubernetes/pkg/client/unversioned/portforward"
diff --git a/pkg/client/unversioned/remotecommand/doc.go b/pkg/client/unversioned/remotecommand/doc.go
index b9f0db2d9abb2..85a91f2339f73 100644
--- a/pkg/client/unversioned/remotecommand/doc.go
+++ b/pkg/client/unversioned/remotecommand/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package remotecommand adds support for executing commands in containers,
 // with support for separate stdin, stdout, and stderr streams, as well as
 // TTY.
-package remotecommand
+package remotecommand // import "k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
diff --git a/pkg/cloudprovider/doc.go b/pkg/cloudprovider/doc.go
index 7192394c39649..41f8ae8607b09 100644
--- a/pkg/cloudprovider/doc.go
+++ b/pkg/cloudprovider/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package cloudprovider supplies interfaces and implementations for cloud service providers.
-package cloudprovider
+package cloudprovider // import "k8s.io/kubernetes/pkg/cloudprovider"
diff --git a/pkg/cloudprovider/providers/fake/doc.go b/pkg/cloudprovider/providers/fake/doc.go
index caf5b1e52cd90..d550c26c2d5ef 100644
--- a/pkg/cloudprovider/providers/fake/doc.go
+++ b/pkg/cloudprovider/providers/fake/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fake is a test-double implementation of cloudprovider
 // Interface, LoadBalancer and Instances. It is useful for testing.
-package fake
+package fake // import "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
diff --git a/pkg/cloudprovider/providers/gce/doc.go b/pkg/cloudprovider/providers/gce/doc.go
index 25c79b9ec0b85..2981d939d0478 100644
--- a/pkg/cloudprovider/providers/gce/doc.go
+++ b/pkg/cloudprovider/providers/gce/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package gce is an implementation of Interface, LoadBalancer
 // and Instances for Google Compute Engine.
-package gce
+package gce // import "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
diff --git a/pkg/controller/daemon/doc.go b/pkg/controller/daemon/doc.go
index 9a5190a29b38e..571e64422a74c 100644
--- a/pkg/controller/daemon/doc.go
+++ b/pkg/controller/daemon/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package daemon contains logic for watching and synchronizing
 // daemons.
-package daemon
+package daemon // import "k8s.io/kubernetes/pkg/controller/daemon"
diff --git a/pkg/controller/doc.go b/pkg/controller/doc.go
index ded3905820efa..3c5c943da8dd7 100644
--- a/pkg/controller/doc.go
+++ b/pkg/controller/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package controller contains code for controllers (like the replication
 // controller).
-package controller
+package controller // import "k8s.io/kubernetes/pkg/controller"
diff --git a/pkg/controller/endpoint/doc.go b/pkg/controller/endpoint/doc.go
index 2a84e5754f389..b3d86af747a94 100644
--- a/pkg/controller/endpoint/doc.go
+++ b/pkg/controller/endpoint/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service provides EndpointController implementation
 // to manage and sync service endpoints.
-package endpoint
+package endpoint // import "k8s.io/kubernetes/pkg/controller/endpoint"
diff --git a/pkg/controller/framework/doc.go b/pkg/controller/framework/doc.go
index feceba36c996c..1f65fe65e4829 100644
--- a/pkg/controller/framework/doc.go
+++ b/pkg/controller/framework/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package framework implements all the grunt work involved in running a simple controller.
-package framework
+package framework // import "k8s.io/kubernetes/pkg/controller/framework"
diff --git a/pkg/controller/job/doc.go b/pkg/controller/job/doc.go
index 281ab9ad73696..e7219f3381289 100644
--- a/pkg/controller/job/doc.go
+++ b/pkg/controller/job/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package job contains logic for watching and synchronizing jobs.
-package job
+package job // import "k8s.io/kubernetes/pkg/controller/job"
diff --git a/pkg/controller/namespace/doc.go b/pkg/controller/namespace/doc.go
index 7a5556480f6b8..f58f816c051a7 100644
--- a/pkg/controller/namespace/doc.go
+++ b/pkg/controller/namespace/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // namespace contains a controller that handles namespace lifecycle
-package namespace
+package namespace // import "k8s.io/kubernetes/pkg/controller/namespace"
diff --git a/pkg/controller/node/doc.go b/pkg/controller/node/doc.go
index ac61e48586536..b649f1dda49fc 100644
--- a/pkg/controller/node/doc.go
+++ b/pkg/controller/node/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package node contains code for syncing cloud instances with
 // node registry
-package node
+package node // import "k8s.io/kubernetes/pkg/controller/node"
diff --git a/pkg/controller/podautoscaler/doc.go b/pkg/controller/podautoscaler/doc.go
index fbbf843b01b36..b87957e428959 100644
--- a/pkg/controller/podautoscaler/doc.go
+++ b/pkg/controller/podautoscaler/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package podautoscaler contains logic for autoscaling number of
 // pods based on metrics observed.
-package podautoscaler
+package podautoscaler // import "k8s.io/kubernetes/pkg/controller/podautoscaler"
diff --git a/pkg/controller/podgc/doc.go b/pkg/controller/podgc/doc.go
index 6a23ea63141d9..4806c827a9536 100644
--- a/pkg/controller/podgc/doc.go
+++ b/pkg/controller/podgc/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // prioritizes pods to delete by sorting by creation timestamp and deleting the
 // oldest objects first. The PodGCController will not delete non-terminated
 // pods.
-package podgc
+package podgc // import "k8s.io/kubernetes/pkg/controller/podgc"
diff --git a/pkg/controller/replicaset/doc.go b/pkg/controller/replicaset/doc.go
index d93c793804a13..0770ac517203b 100644
--- a/pkg/controller/replicaset/doc.go
+++ b/pkg/controller/replicaset/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replicaset contains logic for watching and synchronizing
 // ReplicaSets.
-package replicaset
+package replicaset // import "k8s.io/kubernetes/pkg/controller/replicaset"
diff --git a/pkg/controller/replication/doc.go b/pkg/controller/replication/doc.go
index eb0f42158f1ae..cf36f61eac53e 100644
--- a/pkg/controller/replication/doc.go
+++ b/pkg/controller/replication/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replication contains logic for watching and synchronizing
 // replication controllers.
-package replication
+package replication // import "k8s.io/kubernetes/pkg/controller/replication"
diff --git a/pkg/controller/resourcequota/doc.go b/pkg/controller/resourcequota/doc.go
index bb2035d2bb316..5e5488f56fdff 100644
--- a/pkg/controller/resourcequota/doc.go
+++ b/pkg/controller/resourcequota/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // resourcequota contains a controller that makes resource quota usage observations
-package resourcequota
+package resourcequota // import "k8s.io/kubernetes/pkg/controller/resourcequota"
diff --git a/pkg/controller/route/doc.go b/pkg/controller/route/doc.go
index 7208f5b4984d5..d6cdbe9c64379 100644
--- a/pkg/controller/route/doc.go
+++ b/pkg/controller/route/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package route contains code for syncing cloud routing rules with
 // the list of registered nodes.
-package route
+package route // import "k8s.io/kubernetes/pkg/controller/route"
diff --git a/pkg/controller/service/doc.go b/pkg/controller/service/doc.go
index 42b9d1f174f78..1c4e0558d7813 100644
--- a/pkg/controller/service/doc.go
+++ b/pkg/controller/service/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service contains code for syncing cloud load balancers
 // with the service registry.
-package service
+package service // import "k8s.io/kubernetes/pkg/controller/service"
diff --git a/pkg/controller/serviceaccount/doc.go b/pkg/controller/serviceaccount/doc.go
index 211796b123549..9aa9063278030 100644
--- a/pkg/controller/serviceaccount/doc.go
+++ b/pkg/controller/serviceaccount/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package serviceaccount provides implementations
 // to manage service accounts and service account tokens
-package serviceaccount
+package serviceaccount // import "k8s.io/kubernetes/pkg/controller/serviceaccount"
diff --git a/pkg/conversion/doc.go b/pkg/conversion/doc.go
index 0c46ef2d169e5..16eda0075e414 100644
--- a/pkg/conversion/doc.go
+++ b/pkg/conversion/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // but for the fields which did not change, copying is automated. This makes it
 // easy to modify the structures you use in memory without affecting the format
 // you store on disk or respond to in your external API calls.
-package conversion
+package conversion // import "k8s.io/kubernetes/pkg/conversion"
diff --git a/pkg/conversion/queryparams/doc.go b/pkg/conversion/queryparams/doc.go
index 4c1002a4c1d84..519e1e4be4886 100644
--- a/pkg/conversion/queryparams/doc.go
+++ b/pkg/conversion/queryparams/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package queryparams provides conversion from versioned
 // runtime objects to URL query values
-package queryparams
+package queryparams // import "k8s.io/kubernetes/pkg/conversion/queryparams"
diff --git a/pkg/credentialprovider/doc.go b/pkg/credentialprovider/doc.go
index 41c12410f05e1..5acf6ef623534 100644
--- a/pkg/credentialprovider/doc.go
+++ b/pkg/credentialprovider/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package credentialprovider supplies interfaces and implementations for
 // docker registry providers to expose their authentication scheme.
-package credentialprovider
+package credentialprovider // import "k8s.io/kubernetes/pkg/credentialprovider"
diff --git a/pkg/credentialprovider/gcp/doc.go b/pkg/credentialprovider/gcp/doc.go
index 09a0b9d5bb66b..fbad381e4baef 100644
--- a/pkg/credentialprovider/gcp/doc.go
+++ b/pkg/credentialprovider/gcp/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package gcp_credentials contains  implementations of DockerConfigProvider
 // for Google Cloud Platform.
-package gcp_credentials
+package gcp_credentials // import "k8s.io/kubernetes/pkg/credentialprovider/gcp"
diff --git a/pkg/dns/doc.go b/pkg/dns/doc.go
index f02745bceab69..efcdcda175d5f 100644
--- a/pkg/dns/doc.go
+++ b/pkg/dns/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // receives. It serves these records by consulting an in memory tree
 // populated with Kubernetes Services and Endpoints received from the Kubernetes
 // API server.
-package dns
+package dns // import "k8s.io/kubernetes/pkg/dns"
diff --git a/pkg/fieldpath/doc.go b/pkg/fieldpath/doc.go
index 83cbdce0c84e5..400d001e7f2ba 100644
--- a/pkg/fieldpath/doc.go
+++ b/pkg/fieldpath/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fieldpath supplies methods for extracting fields from objects
 // given a path to a field.
-package fieldpath
+package fieldpath // import "k8s.io/kubernetes/pkg/fieldpath"
diff --git a/pkg/fields/doc.go b/pkg/fields/doc.go
index 49059e2635262..3129b02a7a950 100644
--- a/pkg/fields/doc.go
+++ b/pkg/fields/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fields implements a simple field system, parsing and matching
 // selectors with sets of fields.
-package fields
+package fields // import "k8s.io/kubernetes/pkg/fields"
diff --git a/pkg/genericapiserver/doc.go b/pkg/genericapiserver/doc.go
index c4abd9097c124..b60a6f9d36217 100644
--- a/pkg/genericapiserver/doc.go
+++ b/pkg/genericapiserver/doc.go
@@ -20,4 +20,4 @@ limitations under the License.
 // pkg/master and pkg/apiserver) here.
 // We plan to move this package into a separate repo on github once it is done.
 // For more details: https://github.com/kubernetes/kubernetes/issues/2742
-package genericapiserver
+package genericapiserver // import "k8s.io/kubernetes/pkg/genericapiserver"
diff --git a/pkg/genericapiserver/options/doc.go b/pkg/genericapiserver/options/doc.go
index a7167a419e9a7..3247f4c57b552 100644
--- a/pkg/genericapiserver/options/doc.go
+++ b/pkg/genericapiserver/options/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // server. It takes a minimal set of dependencies and does not reference
 // implementations, in order to ensure it may be reused by multiple components
 // (such as CLI commands that wish to generate or validate config).
-package options
+package options // import "k8s.io/kubernetes/pkg/genericapiserver/options"
diff --git a/pkg/healthz/doc.go b/pkg/healthz/doc.go
index a70a0eaafce89..2b040a81ba1a1 100644
--- a/pkg/healthz/doc.go
+++ b/pkg/healthz/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package healthz implements basic http server health checking.
 // Usage:
 //   import _ "healthz" registers a handler on the path '/healthz', that serves 200s
-package healthz
+package healthz // import "k8s.io/kubernetes/pkg/healthz"
diff --git a/pkg/httplog/doc.go b/pkg/httplog/doc.go
index 57aa55ab91ef3..139dea694a679 100644
--- a/pkg/httplog/doc.go
+++ b/pkg/httplog/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package httplog contains a helper object and functions to maintain a log
 // along with an http response.
-package httplog
+package httplog // import "k8s.io/kubernetes/pkg/httplog"
diff --git a/pkg/hyperkube/doc.go b/pkg/hyperkube/doc.go
index 78e8506020547..d66d3ac3c269b 100644
--- a/pkg/hyperkube/doc.go
+++ b/pkg/hyperkube/doc.go
@@ -27,4 +27,4 @@ limitations under the License.
 // This package is inspired by https://github.com/spf13/cobra.  However, as
 // the eventual goal is to run *multiple* servers from one call, a new package
 // was needed.
-package hyperkube
+package hyperkube // import "k8s.io/kubernetes/pkg/hyperkube"
diff --git a/pkg/kubectl/doc.go b/pkg/kubectl/doc.go
index d1516ebb7af63..df45d44691bf8 100644
--- a/pkg/kubectl/doc.go
+++ b/pkg/kubectl/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package kubectl is a set of libraries that are used by the kubectl command line tool.
 // They are separated out into a library to support unit testing.  Most functionality should
 // be included in this package, and the main kubectl should really just be an entry point.
-package kubectl
+package kubectl // import "k8s.io/kubernetes/pkg/kubectl"
diff --git a/pkg/kubectl/resource/doc.go b/pkg/kubectl/resource/doc.go
index a0e22e7cf78e9..94944dfe39784 100644
--- a/pkg/kubectl/resource/doc.go
+++ b/pkg/kubectl/resource/doc.go
@@ -21,4 +21,4 @@ limitations under the License.
 // standard command line arguments and parameters into a Visitor that can iterate
 // over all of the identified resources, whether on the server or on the local
 // filesystem.
-package resource
+package resource // import "k8s.io/kubernetes/pkg/kubectl/resource"
diff --git a/pkg/kubelet/cadvisor/doc.go b/pkg/kubelet/cadvisor/doc.go
index 22ae55f26db22..51e23cdd406fe 100644
--- a/pkg/kubelet/cadvisor/doc.go
+++ b/pkg/kubelet/cadvisor/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Kubelet interactions with cAdvisor.
-package cadvisor
+package cadvisor // import "k8s.io/kubernetes/pkg/kubelet/cadvisor"
diff --git a/pkg/kubelet/config/doc.go b/pkg/kubelet/config/doc.go
index 1d839ba325ec8..a72262ff04a87 100644
--- a/pkg/kubelet/config/doc.go
+++ b/pkg/kubelet/config/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package config implements the pod configuration readers.
-package config
+package config // import "k8s.io/kubernetes/pkg/kubelet/config"
diff --git a/pkg/kubelet/doc.go b/pkg/kubelet/doc.go
index 7d31922769f4d..ce5bb18b2cc9f 100644
--- a/pkg/kubelet/doc.go
+++ b/pkg/kubelet/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package kubelet is the package that contains the libraries that drive the Kubelet binary.
 // The kubelet is responsible for node level pod management.  It runs on each worker in the cluster.
-package kubelet
+package kubelet // import "k8s.io/kubernetes/pkg/kubelet"
diff --git a/pkg/kubelet/envvars/doc.go b/pkg/kubelet/envvars/doc.go
index 42fea62f22046..d951937718b4f 100644
--- a/pkg/kubelet/envvars/doc.go
+++ b/pkg/kubelet/envvars/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package envvars is the package that build the environment variables that kubernetes provides
 // to the containers run by it.
-package envvars
+package envvars // import "k8s.io/kubernetes/pkg/kubelet/envvars"
diff --git a/pkg/kubelet/eviction/doc.go b/pkg/kubelet/eviction/doc.go
index 1395301680d88..0db0d82b76603 100644
--- a/pkg/kubelet/eviction/doc.go
+++ b/pkg/kubelet/eviction/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package eviction is responsible for enforcing eviction thresholds to maintain
 // node stability.
-package eviction
+package eviction // import "k8s.io/kubernetes/pkg/kubelet/eviction"
diff --git a/pkg/kubelet/lifecycle/doc.go b/pkg/kubelet/lifecycle/doc.go
index 16c90b6899f45..a6be2c40cc818 100644
--- a/pkg/kubelet/lifecycle/doc.go
+++ b/pkg/kubelet/lifecycle/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Handlers for pod lifecycle events and interfaces to integrate
 // with kubelet admission, synchronization, and eviction of pods.
-package lifecycle
+package lifecycle // import "k8s.io/kubernetes/pkg/kubelet/lifecycle"
diff --git a/pkg/kubelet/pleg/doc.go b/pkg/kubelet/pleg/doc.go
index cda634061c4fa..2263f2cabfbcb 100644
--- a/pkg/kubelet/pleg/doc.go
+++ b/pkg/kubelet/pleg/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package pleg contains types and a generic implementation of the pod
 // lifecycle event generator.
-package pleg
+package pleg // import "k8s.io/kubernetes/pkg/kubelet/pleg"
diff --git a/pkg/kubelet/qos/doc.go b/pkg/kubelet/qos/doc.go
index ebc1cc598b313..46c271afc8058 100644
--- a/pkg/kubelet/qos/doc.go
+++ b/pkg/kubelet/qos/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // when available.
 // Best-Effort containers, which don’t specify a request, can use resources only if not being used
 // by other pods.
-package qos
+package qos // import "k8s.io/kubernetes/pkg/kubelet/qos"
diff --git a/pkg/kubelet/rkt/doc.go b/pkg/kubelet/rkt/doc.go
index 71fdac61c13fe..ac3ca36369dd6 100644
--- a/pkg/kubelet/rkt/doc.go
+++ b/pkg/kubelet/rkt/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package rkt contains the Containerruntime interface implementation for rkt.
-package rkt
+package rkt // import "k8s.io/kubernetes/pkg/kubelet/rkt"
diff --git a/pkg/kubelet/server/doc.go b/pkg/kubelet/server/doc.go
index 22774d20d05b3..843c0a58bdb82 100644
--- a/pkg/kubelet/server/doc.go
+++ b/pkg/kubelet/server/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package server contains functions related to serving Kubelet's external interface.
-package server
+package server // import "k8s.io/kubernetes/pkg/kubelet/server"
diff --git a/pkg/kubelet/server/remotecommand/doc.go b/pkg/kubelet/server/remotecommand/doc.go
index 34d8f40eff09f..24f9393abfb7b 100644
--- a/pkg/kubelet/server/remotecommand/doc.go
+++ b/pkg/kubelet/server/remotecommand/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // package remotecommand contains functions related to executing commands in and attaching to pods.
-package remotecommand
+package remotecommand // import "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
diff --git a/pkg/kubelet/server/stats/doc.go b/pkg/kubelet/server/stats/doc.go
index f8d987c1ee9d8..a43a61e4c9691 100644
--- a/pkg/kubelet/server/stats/doc.go
+++ b/pkg/kubelet/server/stats/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package stats handles exporting Kubelet and container stats.
 // NOTE: We intend to move this functionality into a standalone pod, so this package should be very
 // loosely coupled to the rest of the Kubelet.
-package stats
+package stats // import "k8s.io/kubernetes/pkg/kubelet/server/stats"
diff --git a/pkg/kubelet/types/doc.go b/pkg/kubelet/types/doc.go
index 0d9efe50f0293..88e345636eb1e 100644
--- a/pkg/kubelet/types/doc.go
+++ b/pkg/kubelet/types/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Common types in the Kubelet.
-package types
+package types // import "k8s.io/kubernetes/pkg/kubelet/types"
diff --git a/pkg/kubelet/util/doc.go b/pkg/kubelet/util/doc.go
index 727215372fc8e..ac0d4097b8a08 100644
--- a/pkg/kubelet/util/doc.go
+++ b/pkg/kubelet/util/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Utility functions.
-package util
+package util // import "k8s.io/kubernetes/pkg/kubelet/util"
diff --git a/pkg/labels/doc.go b/pkg/labels/doc.go
index 35ba788094467..64a41555629fb 100644
--- a/pkg/labels/doc.go
+++ b/pkg/labels/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package labels implements a simple label system, parsing and matching
 // selectors with sets of labels.
-package labels
+package labels // import "k8s.io/kubernetes/pkg/labels"
diff --git a/pkg/master/doc.go b/pkg/master/doc.go
index 1c0ae1ed8f584..2aae50ed36829 100644
--- a/pkg/master/doc.go
+++ b/pkg/master/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package master contains code for setting up and running a Kubernetes
 // cluster master.
-package master
+package master // import "k8s.io/kubernetes/pkg/master"
diff --git a/pkg/master/ports/doc.go b/pkg/master/ports/doc.go
index a2a002101ca35..5e14f82e7164f 100644
--- a/pkg/master/ports/doc.go
+++ b/pkg/master/ports/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package ports defines ports used by various pieces of the kubernetes
 // infrastructure.
-package ports
+package ports // import "k8s.io/kubernetes/pkg/master/ports"
diff --git a/pkg/probe/doc.go b/pkg/probe/doc.go
index 89c70b2c16afb..10fad97067678 100644
--- a/pkg/probe/doc.go
+++ b/pkg/probe/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package probe contains utilities for health probing, as well as health status information.
-package probe
+package probe // import "k8s.io/kubernetes/pkg/probe"
diff --git a/pkg/proxy/config/doc.go b/pkg/proxy/config/doc.go
index 632d1618b82b0..cb0f23b6a3926 100644
--- a/pkg/proxy/config/doc.go
+++ b/pkg/proxy/config/doc.go
@@ -22,4 +22,4 @@ limitations under the License.
 // to resolve conflicts of any sort. Basic idea is that each configuration source gets a channel
 // from the Config service and pushes updates to it via that channel. Config then keeps track of
 // incremental & replace changes and distributes them to listeners as appropriate.
-package config
+package config // import "k8s.io/kubernetes/pkg/proxy/config"
diff --git a/pkg/proxy/doc.go b/pkg/proxy/doc.go
index a69b3082cd897..3bed0fa39030a 100644
--- a/pkg/proxy/doc.go
+++ b/pkg/proxy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package proxy implements the layer-3 network proxy.
-package proxy
+package proxy // import "k8s.io/kubernetes/pkg/proxy"
diff --git a/pkg/quota/evaluator/core/doc.go b/pkg/quota/evaluator/core/doc.go
index f80963bcf3055..3c9d632cbfe1a 100644
--- a/pkg/quota/evaluator/core/doc.go
+++ b/pkg/quota/evaluator/core/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // core contains modules that interface with the core api group
-package core
+package core // import "k8s.io/kubernetes/pkg/quota/evaluator/core"
diff --git a/pkg/registry/certificates/doc.go b/pkg/registry/certificates/doc.go
index 8f69902f2eab7..4bea76e459bef 100644
--- a/pkg/registry/certificates/doc.go
+++ b/pkg/registry/certificates/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing CertificateSigningRequest objects.
-package certificates
+package certificates // import "k8s.io/kubernetes/pkg/registry/certificates"
diff --git a/pkg/registry/clusterrole/doc.go b/pkg/registry/clusterrole/doc.go
index 11dea907de9f7..c267818d90d60 100644
--- a/pkg/registry/clusterrole/doc.go
+++ b/pkg/registry/clusterrole/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing ClusterRole objects.
-package clusterrole
+package clusterrole // import "k8s.io/kubernetes/pkg/registry/clusterrole"
diff --git a/pkg/registry/clusterrolebinding/doc.go b/pkg/registry/clusterrolebinding/doc.go
index 8df6c7cc20186..edaa07b3a56a0 100644
--- a/pkg/registry/clusterrolebinding/doc.go
+++ b/pkg/registry/clusterrolebinding/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing ClusterRoleBinding objects.
-package clusterrolebinding
+package clusterrolebinding // import "k8s.io/kubernetes/pkg/registry/clusterrolebinding"
diff --git a/pkg/registry/componentstatus/doc.go b/pkg/registry/componentstatus/doc.go
index af0672af83814..93c8c04345c05 100644
--- a/pkg/registry/componentstatus/doc.go
+++ b/pkg/registry/componentstatus/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package componentstatus provides interfaces and implementation for retrieving cluster
 // component status.
-package componentstatus
+package componentstatus // import "k8s.io/kubernetes/pkg/registry/componentstatus"
diff --git a/pkg/registry/configmap/doc.go b/pkg/registry/configmap/doc.go
index dd414e3ce4700..db69d865209ee 100644
--- a/pkg/registry/configmap/doc.go
+++ b/pkg/registry/configmap/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package configmap provides Registry interface
 // and its REST implementation for storing
 // ConfigMap API objects.
-package configmap
+package configmap // import "k8s.io/kubernetes/pkg/registry/configmap"
diff --git a/pkg/registry/controller/doc.go b/pkg/registry/controller/doc.go
index 3d5e224104320..456e7635cd442 100644
--- a/pkg/registry/controller/doc.go
+++ b/pkg/registry/controller/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package controller provides Registry interface and it's RESTStorage
 // implementation for storing ReplicationController api objects.
-package controller
+package controller // import "k8s.io/kubernetes/pkg/registry/controller"
diff --git a/pkg/registry/daemonset/doc.go b/pkg/registry/daemonset/doc.go
index 2c1697402b5d5..fbf26239974ad 100644
--- a/pkg/registry/daemonset/doc.go
+++ b/pkg/registry/daemonset/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package daemonset provides Registry interface and its RESTStorage
 // implementation for storing DaemonSet api objects.
-package daemonset
+package daemonset // import "k8s.io/kubernetes/pkg/registry/daemonset"
diff --git a/pkg/registry/deployment/doc.go b/pkg/registry/deployment/doc.go
index 6bc30adfacbaa..16a56ab47b77f 100644
--- a/pkg/registry/deployment/doc.go
+++ b/pkg/registry/deployment/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package deployment
+package deployment // import "k8s.io/kubernetes/pkg/registry/deployment"
diff --git a/pkg/registry/doc.go b/pkg/registry/doc.go
index 2a8a439efd11d..21331a03e3871 100644
--- a/pkg/registry/doc.go
+++ b/pkg/registry/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package registry implements the storage and system logic for the core of the api server.
-package registry
+package registry // import "k8s.io/kubernetes/pkg/registry"
diff --git a/pkg/registry/endpoint/doc.go b/pkg/registry/endpoint/doc.go
index 8d8bffd52f3eb..31bf514ff85bd 100644
--- a/pkg/registry/endpoint/doc.go
+++ b/pkg/registry/endpoint/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package endpoint provides Registry interface and it's RESTStorage
 // implementation for storing Endpoint api objects.
-package endpoint
+package endpoint // import "k8s.io/kubernetes/pkg/registry/endpoint"
diff --git a/pkg/registry/event/doc.go b/pkg/registry/event/doc.go
index 5c5446d61a693..0af74408036ff 100644
--- a/pkg/registry/event/doc.go
+++ b/pkg/registry/event/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package event provides Registry interface and it's REST
 // implementation for storing Event api objects.
-package event
+package event // import "k8s.io/kubernetes/pkg/registry/event"
diff --git a/pkg/registry/generic/doc.go b/pkg/registry/generic/doc.go
index 47bb95304046b..002e0fd42aaa6 100644
--- a/pkg/registry/generic/doc.go
+++ b/pkg/registry/generic/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package generic provides a generic object store interface and a
 // generic label/field matching type.
-package generic
+package generic // import "k8s.io/kubernetes/pkg/registry/generic"
diff --git a/pkg/registry/generic/registry/doc.go b/pkg/registry/generic/registry/doc.go
index 643a6fb7b6598..ea3c0c94ffe47 100644
--- a/pkg/registry/generic/registry/doc.go
+++ b/pkg/registry/generic/registry/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package etcd has a generic implementation of a registry that
 // stores things in etcd.
-package registry
+package registry // import "k8s.io/kubernetes/pkg/registry/generic/registry"
diff --git a/pkg/registry/generic/rest/doc.go b/pkg/registry/generic/rest/doc.go
index 9696087fb2343..d08a7f680edb6 100644
--- a/pkg/registry/generic/rest/doc.go
+++ b/pkg/registry/generic/rest/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package rest has generic implementations of resources used for
 // REST responses
-package rest
+package rest // import "k8s.io/kubernetes/pkg/registry/generic/rest"
diff --git a/pkg/registry/horizontalpodautoscaler/doc.go b/pkg/registry/horizontalpodautoscaler/doc.go
index 349ff005443dd..5191ba22100a2 100644
--- a/pkg/registry/horizontalpodautoscaler/doc.go
+++ b/pkg/registry/horizontalpodautoscaler/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package horizontalpodautoscaler
+package horizontalpodautoscaler // import "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler"
diff --git a/pkg/registry/ingress/doc.go b/pkg/registry/ingress/doc.go
index 42fb63fc57ad2..d08333e2b8e47 100644
--- a/pkg/registry/ingress/doc.go
+++ b/pkg/registry/ingress/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ingress
+package ingress // import "k8s.io/kubernetes/pkg/registry/ingress"
diff --git a/pkg/registry/job/doc.go b/pkg/registry/job/doc.go
index f34b36abc0458..c03ecc0ee550d 100644
--- a/pkg/registry/job/doc.go
+++ b/pkg/registry/job/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package job provides Registry interface and it's RESTStorage
 // implementation for storing Job api objects.
-package job
+package job // import "k8s.io/kubernetes/pkg/registry/job"
diff --git a/pkg/registry/limitrange/doc.go b/pkg/registry/limitrange/doc.go
index 4a6ab76c5c456..fcbea30d46a77 100644
--- a/pkg/registry/limitrange/doc.go
+++ b/pkg/registry/limitrange/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package limitrange provides Registry interface and it's REST
 // implementation for storing LimitRange api objects.
-package limitrange
+package limitrange // import "k8s.io/kubernetes/pkg/registry/limitrange"
diff --git a/pkg/registry/namespace/doc.go b/pkg/registry/namespace/doc.go
index f618932fe2cf9..3b14cd59b40e1 100644
--- a/pkg/registry/namespace/doc.go
+++ b/pkg/registry/namespace/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package namespace provides Registry interface and it's REST
 // implementation for storing Namespace api objects.
-package namespace
+package namespace // import "k8s.io/kubernetes/pkg/registry/namespace"
diff --git a/pkg/registry/networkpolicy/doc.go b/pkg/registry/networkpolicy/doc.go
index 3535feb2422c9..f675b88d92ae8 100644
--- a/pkg/registry/networkpolicy/doc.go
+++ b/pkg/registry/networkpolicy/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package networkpolicy
+package networkpolicy // import "k8s.io/kubernetes/pkg/registry/networkpolicy"
diff --git a/pkg/registry/node/doc.go b/pkg/registry/node/doc.go
index 79a95fd3d38d0..6cfbadfb69134 100644
--- a/pkg/registry/node/doc.go
+++ b/pkg/registry/node/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package node provides Registry interface and implementation for storing Nodes.
-package node
+package node // import "k8s.io/kubernetes/pkg/registry/node"
diff --git a/pkg/registry/persistentvolume/doc.go b/pkg/registry/persistentvolume/doc.go
index 06fda296fa906..289d5b17549d6 100644
--- a/pkg/registry/persistentvolume/doc.go
+++ b/pkg/registry/persistentvolume/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package persistentvolume
+package persistentvolume // import "k8s.io/kubernetes/pkg/registry/persistentvolume"
diff --git a/pkg/registry/persistentvolumeclaim/doc.go b/pkg/registry/persistentvolumeclaim/doc.go
index c6950ee8c0f2a..ba4215aa1c3ae 100644
--- a/pkg/registry/persistentvolumeclaim/doc.go
+++ b/pkg/registry/persistentvolumeclaim/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package persistentvolumeclaim
+package persistentvolumeclaim // import "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim"
diff --git a/pkg/registry/petset/doc.go b/pkg/registry/petset/doc.go
index fe54856993ffe..4c289287221ee 100644
--- a/pkg/registry/petset/doc.go
+++ b/pkg/registry/petset/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package petset
+package petset // import "k8s.io/kubernetes/pkg/registry/petset"
diff --git a/pkg/registry/pod/doc.go b/pkg/registry/pod/doc.go
index d2294852b513d..db2d1ca0a1b2e 100644
--- a/pkg/registry/pod/doc.go
+++ b/pkg/registry/pod/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package pod provides Registry interface and it's RESTStorage
 // implementation for storing Pod api objects.
-package pod
+package pod // import "k8s.io/kubernetes/pkg/registry/pod"
diff --git a/pkg/registry/poddisruptionbudget/doc.go b/pkg/registry/poddisruptionbudget/doc.go
index a3ee49ca45880..6cf1c746a0df7 100644
--- a/pkg/registry/poddisruptionbudget/doc.go
+++ b/pkg/registry/poddisruptionbudget/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package poddisruptionbudget
+package poddisruptionbudget // import "k8s.io/kubernetes/pkg/registry/poddisruptionbudget"
diff --git a/pkg/registry/podsecuritypolicy/doc.go b/pkg/registry/podsecuritypolicy/doc.go
index c52667c5b7f86..09cc2eeae894c 100644
--- a/pkg/registry/podsecuritypolicy/doc.go
+++ b/pkg/registry/podsecuritypolicy/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package podsecuritypolicy provides Registry interface and its REST
 // implementation for storing PodSecurityPolicy api objects.
-package podsecuritypolicy
+package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/podsecuritypolicy"
diff --git a/pkg/registry/podtemplate/doc.go b/pkg/registry/podtemplate/doc.go
index b3e43f22ffdf9..e570bc07329ca 100644
--- a/pkg/registry/podtemplate/doc.go
+++ b/pkg/registry/podtemplate/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package podtemplate provides RESTStorage implementations for storing PodTemplate API objects.
-package podtemplate
+package podtemplate // import "k8s.io/kubernetes/pkg/registry/podtemplate"
diff --git a/pkg/registry/registrytest/doc.go b/pkg/registry/registrytest/doc.go
index c4f29f3d5892a..41e2b65cbe619 100644
--- a/pkg/registry/registrytest/doc.go
+++ b/pkg/registry/registrytest/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package registrytest provides tests for Registry implementations
 // for storing Minions, Pods, Schedulers and Services.
-package registrytest
+package registrytest // import "k8s.io/kubernetes/pkg/registry/registrytest"
diff --git a/pkg/registry/replicaset/doc.go b/pkg/registry/replicaset/doc.go
index 3e8d4bfefecc3..10d157805adaa 100644
--- a/pkg/registry/replicaset/doc.go
+++ b/pkg/registry/replicaset/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package replicaset provides Registry interface and it's RESTStorage
 // implementation for storing ReplicaSet api objects.
-package replicaset
+package replicaset // import "k8s.io/kubernetes/pkg/registry/replicaset"
diff --git a/pkg/registry/resourcequota/doc.go b/pkg/registry/resourcequota/doc.go
index aa335fe24c528..f768437f33162 100644
--- a/pkg/registry/resourcequota/doc.go
+++ b/pkg/registry/resourcequota/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package resourcequota provides Registry interface and it's REST
 // implementation for storing ResourceQuota api objects.
-package resourcequota
+package resourcequota // import "k8s.io/kubernetes/pkg/registry/resourcequota"
diff --git a/pkg/registry/role/doc.go b/pkg/registry/role/doc.go
index 38e231021382c..70138264f5f01 100644
--- a/pkg/registry/role/doc.go
+++ b/pkg/registry/role/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing Role objects.
-package role
+package role // import "k8s.io/kubernetes/pkg/registry/role"
diff --git a/pkg/registry/rolebinding/doc.go b/pkg/registry/rolebinding/doc.go
index 581afbb9f2e7e..88fa3e9ec44f3 100644
--- a/pkg/registry/rolebinding/doc.go
+++ b/pkg/registry/rolebinding/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package certificates provides Registry interface and its RESTStorage
 // implementation for storing RoleBinding objects.
-package rolebinding
+package rolebinding // import "k8s.io/kubernetes/pkg/registry/rolebinding"
diff --git a/pkg/registry/scheduledjob/doc.go b/pkg/registry/scheduledjob/doc.go
index 8c30c0a4bf6ce..c755525c16af6 100644
--- a/pkg/registry/scheduledjob/doc.go
+++ b/pkg/registry/scheduledjob/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package scheduledjob provides Registry interface and it's RESTStorage
 // implementation for storing ScheduledJob api objects.
-package scheduledjob
+package scheduledjob // import "k8s.io/kubernetes/pkg/registry/scheduledjob"
diff --git a/pkg/registry/secret/doc.go b/pkg/registry/secret/doc.go
index 1dc79f578f510..8acd5a732c991 100644
--- a/pkg/registry/secret/doc.go
+++ b/pkg/registry/secret/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package secrets provides Registry interface and its REST
 // implementation for storing Secret api objects.
-package secret
+package secret // import "k8s.io/kubernetes/pkg/registry/secret"
diff --git a/pkg/registry/service/doc.go b/pkg/registry/service/doc.go
index 13616309c4a9b..4328bea8f35ca 100644
--- a/pkg/registry/service/doc.go
+++ b/pkg/registry/service/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service provides the Registry interface and its RESTStorage
 // implementation for storing Service api objects.
-package service
+package service // import "k8s.io/kubernetes/pkg/registry/service"
diff --git a/pkg/registry/serviceaccount/doc.go b/pkg/registry/serviceaccount/doc.go
index ea714a980f44b..99a16d4cbd3b0 100644
--- a/pkg/registry/serviceaccount/doc.go
+++ b/pkg/registry/serviceaccount/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package serviceaccount provides a Registry interface and a strategy
 // implementation for storing ServiceAccount API objects.
-package serviceaccount
+package serviceaccount // import "k8s.io/kubernetes/pkg/registry/serviceaccount"
diff --git a/pkg/registry/thirdpartyresource/doc.go b/pkg/registry/thirdpartyresource/doc.go
index 331c94cb0a68a..618bb7950226f 100644
--- a/pkg/registry/thirdpartyresource/doc.go
+++ b/pkg/registry/thirdpartyresource/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package thirdpartyresource provides Registry interface and its REST
 // implementation for storing ThirdPartyResource api objects.
-package thirdpartyresource
+package thirdpartyresource // import "k8s.io/kubernetes/pkg/registry/thirdpartyresource"
diff --git a/pkg/registry/thirdpartyresourcedata/doc.go b/pkg/registry/thirdpartyresourcedata/doc.go
index d9988ccb0852b..22ce5edd5fd33 100644
--- a/pkg/registry/thirdpartyresourcedata/doc.go
+++ b/pkg/registry/thirdpartyresourcedata/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package thirdpartyresourcedata provides Registry interface and its REST
 // implementation for storing ThirdPartyResourceData api objects.
-package thirdpartyresourcedata
+package thirdpartyresourcedata // import "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata"
diff --git a/pkg/runtime/doc.go b/pkg/runtime/doc.go
index a9d084d9fbeed..83accf4f3de88 100644
--- a/pkg/runtime/doc.go
+++ b/pkg/runtime/doc.go
@@ -42,4 +42,4 @@ limitations under the License.
 // As a bonus, a few common types useful from all api objects and versions
 // are provided in types.go.
 
-package runtime
+package runtime // import "k8s.io/kubernetes/pkg/runtime"
diff --git a/pkg/runtime/serializer/protobuf/doc.go b/pkg/runtime/serializer/protobuf/doc.go
index 381748d69fd58..19e8a692cffcf 100644
--- a/pkg/runtime/serializer/protobuf/doc.go
+++ b/pkg/runtime/serializer/protobuf/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package protobuf provides a Kubernetes serializer for the protobuf format.
-package protobuf
+package protobuf // import "k8s.io/kubernetes/pkg/runtime/serializer/protobuf"
diff --git a/pkg/security/doc.go b/pkg/security/doc.go
index 1652dbeaabbef..57bed3a174598 100644
--- a/pkg/security/doc.go
+++ b/pkg/security/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package security contains security apis and implementations.
-package security
+package security // import "k8s.io/kubernetes/pkg/security"
diff --git a/pkg/securitycontext/doc.go b/pkg/securitycontext/doc.go
index 529451e50cd33..3ec795d473e67 100644
--- a/pkg/securitycontext/doc.go
+++ b/pkg/securitycontext/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package securitycontext contains security context api implementations
-package securitycontext
+package securitycontext // import "k8s.io/kubernetes/pkg/securitycontext"
diff --git a/pkg/storage/doc.go b/pkg/storage/doc.go
index d2c5dbfc45621..901ea65093d67 100644
--- a/pkg/storage/doc.go
+++ b/pkg/storage/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Interfaces for database-related operations.
-package storage
+package storage // import "k8s.io/kubernetes/pkg/storage"
diff --git a/pkg/storage/etcd/doc.go b/pkg/storage/etcd/doc.go
index 73e2f50c41632..22b269d5aec0d 100644
--- a/pkg/storage/etcd/doc.go
+++ b/pkg/storage/etcd/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package etcd
+package etcd // import "k8s.io/kubernetes/pkg/storage/etcd"
diff --git a/pkg/storage/etcd/etcdtest/doc.go b/pkg/storage/etcd/etcdtest/doc.go
index dde65fb9c9d8d..23f749e5ee557 100644
--- a/pkg/storage/etcd/etcdtest/doc.go
+++ b/pkg/storage/etcd/etcdtest/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package etcdtest
+package etcdtest // import "k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
diff --git a/pkg/storage/etcd/util/doc.go b/pkg/storage/etcd/util/doc.go
index 48a70cb737dce..d10b9a9922bd1 100644
--- a/pkg/storage/etcd/util/doc.go
+++ b/pkg/storage/etcd/util/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package util holds generic etcd-related utility functions that any user of ectd might want to
 // use, without pulling in kubernetes-specific code.
-package util
+package util // import "k8s.io/kubernetes/pkg/storage/etcd/util"
diff --git a/pkg/types/doc.go b/pkg/types/doc.go
index 783cbcdc8db3b..b2f6f58b6601b 100644
--- a/pkg/types/doc.go
+++ b/pkg/types/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package types implements various generic types used throughout kubernetes.
-package types
+package types // import "k8s.io/kubernetes/pkg/types"
diff --git a/pkg/ui/doc.go b/pkg/ui/doc.go
index 4a1abc71c7fed..d8335ce904b5b 100644
--- a/pkg/ui/doc.go
+++ b/pkg/ui/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // package ui contains utilities for accessing the static data files compiled in
 // the data/* subdirectories.
-package ui
+package ui // import "k8s.io/kubernetes/pkg/ui"
diff --git a/pkg/util/bandwidth/doc.go b/pkg/util/bandwidth/doc.go
index 289b17fe291e4..3c26aebbf98ee 100644
--- a/pkg/util/bandwidth/doc.go
+++ b/pkg/util/bandwidth/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package bandwidth provides utilities for bandwidth shaping
-package bandwidth
+package bandwidth // import "k8s.io/kubernetes/pkg/util/bandwidth"
diff --git a/pkg/util/chmod/doc.go b/pkg/util/chmod/doc.go
index 4e39125419742..100e752f4e15a 100644
--- a/pkg/util/chmod/doc.go
+++ b/pkg/util/chmod/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package chown provides an interface and implementations
 // for things that run run the chmod system call.
-package chmod
+package chmod // import "k8s.io/kubernetes/pkg/util/chmod"
diff --git a/pkg/util/chown/doc.go b/pkg/util/chown/doc.go
index cf71fd1568ea7..405cda98b34bf 100644
--- a/pkg/util/chown/doc.go
+++ b/pkg/util/chown/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package chown provides utilities to chown a path
-package chown
+package chown // import "k8s.io/kubernetes/pkg/util/chown"
diff --git a/pkg/util/config/doc.go b/pkg/util/config/doc.go
index 5dbb37d44874d..5e9a469dff6cc 100644
--- a/pkg/util/config/doc.go
+++ b/pkg/util/config/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package config provides utility objects for decoupling sources of configuration and the
 // actual configuration state. Consumers must implement the Merger interface to unify
 // the sources of change into an object.
-package config
+package config // import "k8s.io/kubernetes/pkg/util/config"
diff --git a/pkg/util/dbus/doc.go b/pkg/util/dbus/doc.go
index e09ad3e5c8620..b07da628d9858 100644
--- a/pkg/util/dbus/doc.go
+++ b/pkg/util/dbus/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package dbus provides an injectable interface and implementations for D-Bus communication
-package dbus
+package dbus // import "k8s.io/kubernetes/pkg/util/dbus"
diff --git a/pkg/util/doc.go b/pkg/util/doc.go
index 1747db5506714..f7e214f316276 100644
--- a/pkg/util/doc.go
+++ b/pkg/util/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package util implements various utility functions used in both testing and implementation
 // of Kubernetes. Package util may not depend on any other package in the Kubernetes
 // package tree.
-package util
+package util // import "k8s.io/kubernetes/pkg/util"
diff --git a/pkg/util/errors/doc.go b/pkg/util/errors/doc.go
index b3b39bc388f3e..9590c0d21f955 100644
--- a/pkg/util/errors/doc.go
+++ b/pkg/util/errors/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package errors implements various utility functions and types around errors.
-package errors
+package errors // import "k8s.io/kubernetes/pkg/util/errors"
diff --git a/pkg/util/exec/doc.go b/pkg/util/exec/doc.go
index 8b824d24456ea..de7301c8d1ef5 100644
--- a/pkg/util/exec/doc.go
+++ b/pkg/util/exec/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package exec provides an injectable interface and implementations for running commands.
-package exec
+package exec // import "k8s.io/kubernetes/pkg/util/exec"
diff --git a/pkg/util/flushwriter/doc.go b/pkg/util/flushwriter/doc.go
index 1e7e324a1540a..2df7823628c06 100644
--- a/pkg/util/flushwriter/doc.go
+++ b/pkg/util/flushwriter/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package flushwriter implements a wrapper for a writer that flushes on every
 // write if that writer implements the io.Flusher interface
-package flushwriter
+package flushwriter // import "k8s.io/kubernetes/pkg/util/flushwriter"
diff --git a/pkg/util/httpstream/doc.go b/pkg/util/httpstream/doc.go
index 1da83f14b18c2..5e4f4fa3d3479 100644
--- a/pkg/util/httpstream/doc.go
+++ b/pkg/util/httpstream/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package httpstream adds multiplexed streaming support to HTTP requests and
 // responses via connection upgrades.
-package httpstream
+package httpstream // import "k8s.io/kubernetes/pkg/util/httpstream"
diff --git a/pkg/util/iptables/doc.go b/pkg/util/iptables/doc.go
index 90d1b45b16a00..f264982934251 100644
--- a/pkg/util/iptables/doc.go
+++ b/pkg/util/iptables/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package iptables provides an interface and implementations for running iptables commands.
-package iptables
+package iptables // import "k8s.io/kubernetes/pkg/util/iptables"
diff --git a/pkg/util/jsonpath/doc.go b/pkg/util/jsonpath/doc.go
index 2a6e1706170fc..0077f30355c13 100644
--- a/pkg/util/jsonpath/doc.go
+++ b/pkg/util/jsonpath/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // package jsonpath is a template engine using jsonpath syntax,
 // which can be seen at http://goessner.net/articles/JsonPath/.
 // In addition, it has {range} {end} function to iterate list and slice.
-package jsonpath
+package jsonpath // import "k8s.io/kubernetes/pkg/util/jsonpath"
diff --git a/pkg/util/labels/doc.go b/pkg/util/labels/doc.go
index c87305fb09148..a5e83763e62ed 100644
--- a/pkg/util/labels/doc.go
+++ b/pkg/util/labels/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package labels provides utilities to work with Kubernetes labels.
-package labels
+package labels // import "k8s.io/kubernetes/pkg/util/labels"
diff --git a/pkg/util/limitwriter/doc.go b/pkg/util/limitwriter/doc.go
index 84e693e160956..02720adb7eb3d 100644
--- a/pkg/util/limitwriter/doc.go
+++ b/pkg/util/limitwriter/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package limitwriter provides a writer that only allows a certain number of bytes to be
 // written.
-package limitwriter
+package limitwriter // import "k8s.io/kubernetes/pkg/util/limitwriter"
diff --git a/pkg/util/mount/doc.go b/pkg/util/mount/doc.go
index 0e225e0a1b57b..15179e53f2da6 100644
--- a/pkg/util/mount/doc.go
+++ b/pkg/util/mount/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package mount defines an interface to mounting filesystems.
-package mount
+package mount // import "k8s.io/kubernetes/pkg/util/mount"
diff --git a/pkg/util/oom/doc.go b/pkg/util/oom/doc.go
index 9825a53f2a5a6..29148f6f59818 100644
--- a/pkg/util/oom/doc.go
+++ b/pkg/util/oom/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package oom implements utility functions relating to out of memory management.
-package oom
+package oom // import "k8s.io/kubernetes/pkg/util/oom"
diff --git a/pkg/util/pod/doc.go b/pkg/util/pod/doc.go
index d7a8ff226e8fd..ba38c1f55de7a 100644
--- a/pkg/util/pod/doc.go
+++ b/pkg/util/pod/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package pod provides utilities to work with Kubernetes pod and pod templates.
-package pod
+package pod // import "k8s.io/kubernetes/pkg/util/pod"
diff --git a/pkg/util/procfs/doc.go b/pkg/util/procfs/doc.go
index 2e99311d02893..bf4a78d03d784 100644
--- a/pkg/util/procfs/doc.go
+++ b/pkg/util/procfs/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package procfs implements utility functions relating to the /proc mount.
-package procfs
+package procfs // import "k8s.io/kubernetes/pkg/util/procfs"
diff --git a/pkg/util/proxy/doc.go b/pkg/util/proxy/doc.go
index 06bb03f04e8f7..eb741e65044a2 100644
--- a/pkg/util/proxy/doc.go
+++ b/pkg/util/proxy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package proxy provides transport and upgrade support for proxies
-package proxy
+package proxy // import "k8s.io/kubernetes/pkg/util/proxy"
diff --git a/pkg/util/selinux/doc.go b/pkg/util/selinux/doc.go
index c379043875a0d..5061cd6bc86a6 100644
--- a/pkg/util/selinux/doc.go
+++ b/pkg/util/selinux/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package selinux contains selinux utility functions.
-package selinux
+package selinux // import "k8s.io/kubernetes/pkg/util/selinux"
diff --git a/pkg/util/wait/doc.go b/pkg/util/wait/doc.go
index ff89dc170e86c..5900713982fcd 100644
--- a/pkg/util/wait/doc.go
+++ b/pkg/util/wait/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package wait provides tools for polling or listening for changes
 // to a condition.
-package wait
+package wait // import "k8s.io/kubernetes/pkg/util/wait"
diff --git a/pkg/util/workqueue/doc.go b/pkg/util/workqueue/doc.go
index 2a00c74ac5f57..7d7f733abdb37 100644
--- a/pkg/util/workqueue/doc.go
+++ b/pkg/util/workqueue/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 //  * Multiple consumers and producers. In particular, it is allowed for an
 //      item to be reenqueued while it is being processed.
 //  * Shutdown notifications.
-package workqueue
+package workqueue // import "k8s.io/kubernetes/pkg/util/workqueue"
diff --git a/pkg/util/wsstream/doc.go b/pkg/util/wsstream/doc.go
index e5770acfb0d89..3bda93e2692f1 100644
--- a/pkg/util/wsstream/doc.go
+++ b/pkg/util/wsstream/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // The Conn type allows callers to multiplex multiple read/write channels over
 // a single websocket. The Reader type allows an io.Reader to be copied over
 // a websocket channel as binary content.
-package wsstream
+package wsstream // import "k8s.io/kubernetes/pkg/util/wsstream"
diff --git a/pkg/version/doc.go b/pkg/version/doc.go
index ccedec76f619c..3cb84338d045e 100644
--- a/pkg/version/doc.go
+++ b/pkg/version/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package version supplies version information collected at build time to
 // kubernetes components.
-package version
+package version // import "k8s.io/kubernetes/pkg/version"
diff --git a/pkg/volume/aws_ebs/doc.go b/pkg/volume/aws_ebs/doc.go
index 8632d39c4e553..2d73712242bb6 100644
--- a/pkg/volume/aws_ebs/doc.go
+++ b/pkg/volume/aws_ebs/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package aws_ebs contains the internal representation of AWS Elastic
 // Block Store volumes.
-package aws_ebs
+package aws_ebs // import "k8s.io/kubernetes/pkg/volume/aws_ebs"
diff --git a/pkg/volume/azure_file/doc.go b/pkg/volume/azure_file/doc.go
index 91fe54372e5b8..262683625a58f 100644
--- a/pkg/volume/azure_file/doc.go
+++ b/pkg/volume/azure_file/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package azure_file contains the internal representation of
 // Azure File Service Volume
-package azure_file
+package azure_file // import "k8s.io/kubernetes/pkg/volume/azure_file"
diff --git a/pkg/volume/cephfs/doc.go b/pkg/volume/cephfs/doc.go
index 0805915467aa1..3c0ad06c19834 100644
--- a/pkg/volume/cephfs/doc.go
+++ b/pkg/volume/cephfs/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package nfs contains the internal representation of Ceph file system
 // (CephFS) volumes.
-package cephfs
+package cephfs // import "k8s.io/kubernetes/pkg/volume/cephfs"
diff --git a/pkg/volume/cinder/doc.go b/pkg/volume/cinder/doc.go
index 08559bc147649..08e6fa8ab1b16 100644
--- a/pkg/volume/cinder/doc.go
+++ b/pkg/volume/cinder/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package cinder contains the internal representation of cinder volumes.
-package cinder
+package cinder // import "k8s.io/kubernetes/pkg/volume/cinder"
diff --git a/pkg/volume/configmap/doc.go b/pkg/volume/configmap/doc.go
index 565a192604116..3f2a869205f80 100644
--- a/pkg/volume/configmap/doc.go
+++ b/pkg/volume/configmap/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package configmap contains the internal representation of configMap volumes.
-package configmap
+package configmap // import "k8s.io/kubernetes/pkg/volume/configmap"
diff --git a/pkg/volume/doc.go b/pkg/volume/doc.go
index df39f32913c14..c98a5a1537a5a 100644
--- a/pkg/volume/doc.go
+++ b/pkg/volume/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package volume includes internal representations of external volume types
 // as well as utility methods required to mount/unmount volumes to kubelets.
-package volume
+package volume // import "k8s.io/kubernetes/pkg/volume"
diff --git a/pkg/volume/empty_dir/doc.go b/pkg/volume/empty_dir/doc.go
index 10d7abd212fb7..e790f5588d830 100644
--- a/pkg/volume/empty_dir/doc.go
+++ b/pkg/volume/empty_dir/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package empty_dir contains the internal representation of emptyDir
 // volumes.
-package empty_dir
+package empty_dir // import "k8s.io/kubernetes/pkg/volume/empty_dir"
diff --git a/pkg/volume/fc/doc.go b/pkg/volume/fc/doc.go
index 3f23662adb12b..314f86bbe78dc 100644
--- a/pkg/volume/fc/doc.go
+++ b/pkg/volume/fc/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package fc contains the internal representation of
 // Fibre Channel (fc) volumes.
-package fc
+package fc // import "k8s.io/kubernetes/pkg/volume/fc"
diff --git a/pkg/volume/flocker/doc.go b/pkg/volume/flocker/doc.go
index 440e74ed14d89..e93a7489c1382 100644
--- a/pkg/volume/flocker/doc.go
+++ b/pkg/volume/flocker/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package flocker contains the internal representation of Flocker volumes
-package flocker
+package flocker // import "k8s.io/kubernetes/pkg/volume/flocker"
diff --git a/pkg/volume/gce_pd/doc.go b/pkg/volume/gce_pd/doc.go
index 39b5db1d9a6ba..ecee8839ac20b 100644
--- a/pkg/volume/gce_pd/doc.go
+++ b/pkg/volume/gce_pd/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package gce_pd contains the internal representation of GCE PersistentDisk
 // volumes.
-package gce_pd
+package gce_pd // import "k8s.io/kubernetes/pkg/volume/gce_pd"
diff --git a/pkg/volume/git_repo/doc.go b/pkg/volume/git_repo/doc.go
index 349182085efa9..beb723e2c0881 100644
--- a/pkg/volume/git_repo/doc.go
+++ b/pkg/volume/git_repo/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package git_repo contains the internal representation of git repo volumes.
-package git_repo
+package git_repo // import "k8s.io/kubernetes/pkg/volume/git_repo"
diff --git a/pkg/volume/glusterfs/doc.go b/pkg/volume/glusterfs/doc.go
index 8184f296a4403..5fa91657a9631 100644
--- a/pkg/volume/glusterfs/doc.go
+++ b/pkg/volume/glusterfs/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package glusterfs contains the internal representation of glusterfs
 // volumes.
-package glusterfs
+package glusterfs // import "k8s.io/kubernetes/pkg/volume/glusterfs"
diff --git a/pkg/volume/host_path/doc.go b/pkg/volume/host_path/doc.go
index 94f5690f21d05..8d6ea5ffdfda1 100644
--- a/pkg/volume/host_path/doc.go
+++ b/pkg/volume/host_path/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package host_path contains the internal representation of hostPath
 // volumes.
-package host_path
+package host_path // import "k8s.io/kubernetes/pkg/volume/host_path"
diff --git a/pkg/volume/iscsi/doc.go b/pkg/volume/iscsi/doc.go
index e0588b2cf669d..c8f4471245c43 100644
--- a/pkg/volume/iscsi/doc.go
+++ b/pkg/volume/iscsi/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package iscsi contains the internal representation of Internet Small
 // Computer System Interface (iSCSI) volumes.
-package iscsi
+package iscsi // import "k8s.io/kubernetes/pkg/volume/iscsi"
diff --git a/pkg/volume/nfs/doc.go b/pkg/volume/nfs/doc.go
index df5a513c7f226..c4c55f21044d5 100644
--- a/pkg/volume/nfs/doc.go
+++ b/pkg/volume/nfs/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package nfs contains the internal representation of network file system
 // (NFS) volumes.
-package nfs
+package nfs // import "k8s.io/kubernetes/pkg/volume/nfs"
diff --git a/pkg/volume/rbd/doc.go b/pkg/volume/rbd/doc.go
index 66f62222594a3..60ed4f6582136 100644
--- a/pkg/volume/rbd/doc.go
+++ b/pkg/volume/rbd/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package rbd contains the internal representation of Rados Block Store (Ceph)
 // volumes.
-package rbd
+package rbd // import "k8s.io/kubernetes/pkg/volume/rbd"
diff --git a/pkg/volume/secret/doc.go b/pkg/volume/secret/doc.go
index 3e0ec33d2fade..98c498705daf0 100644
--- a/pkg/volume/secret/doc.go
+++ b/pkg/volume/secret/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package secret contains the internal representation of secret volumes.
-package secret
+package secret // import "k8s.io/kubernetes/pkg/volume/secret"
diff --git a/pkg/volume/util/doc.go b/pkg/volume/util/doc.go
index 82c976e7df93d..620add69dff1d 100644
--- a/pkg/volume/util/doc.go
+++ b/pkg/volume/util/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Contains utility code for use by volume plugins.
-package util
+package util // import "k8s.io/kubernetes/pkg/volume/util"
diff --git a/pkg/watch/doc.go b/pkg/watch/doc.go
index 5fde5e7427a52..cb866d873229f 100644
--- a/pkg/watch/doc.go
+++ b/pkg/watch/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package watch contains a generic watchable interface, and a fake for
 // testing code that uses the watch interface.
-package watch
+package watch // import "k8s.io/kubernetes/pkg/watch"
diff --git a/pkg/watch/json/doc.go b/pkg/watch/json/doc.go
index e9fb0fce1f7f6..5e84c43a55796 100644
--- a/pkg/watch/json/doc.go
+++ b/pkg/watch/json/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package json implements a simple encoder and decoder for streams
 // of watch events over io.Writer/Readers
-package json
+package json // import "k8s.io/kubernetes/pkg/watch/json"
diff --git a/plugin/pkg/admission/antiaffinity/doc.go b/plugin/pkg/admission/antiaffinity/doc.go
index 9fc189b15e29b..145faa0d9e908 100644
--- a/plugin/pkg/admission/antiaffinity/doc.go
+++ b/plugin/pkg/admission/antiaffinity/doc.go
@@ -25,4 +25,4 @@ limitations under the License.
 // but for now this admission controller provides a simple protection,
 // on the assumption that the only legitimate use of hard pod anti-affinity
 // is to exclude other pods from the same node.
-package antiaffinity
+package antiaffinity // import "k8s.io/kubernetes/plugin/pkg/admission/antiaffinity"
diff --git a/plugin/pkg/admission/persistentvolume/label/doc.go b/plugin/pkg/admission/persistentvolume/label/doc.go
index 22f486b5c372d..b1e2c79e4c8d4 100644
--- a/plugin/pkg/admission/persistentvolume/label/doc.go
+++ b/plugin/pkg/admission/persistentvolume/label/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // labels created persistent volumes with zone information
 // as provided by the cloud provider
-package label
+package label // import "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label"
diff --git a/plugin/pkg/admission/resourcequota/doc.go b/plugin/pkg/admission/resourcequota/doc.go
index 28923b16d8330..3dd1422872cac 100644
--- a/plugin/pkg/admission/resourcequota/doc.go
+++ b/plugin/pkg/admission/resourcequota/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // resourcequota enforces all incoming requests against any applied quota
 // in the namespace context of the request
-package resourcequota
+package resourcequota // import "k8s.io/kubernetes/plugin/pkg/admission/resourcequota"
diff --git a/plugin/pkg/admission/security/doc.go b/plugin/pkg/admission/security/doc.go
index 6b13aeda9241f..4177e557c4ba5 100644
--- a/plugin/pkg/admission/security/doc.go
+++ b/plugin/pkg/admission/security/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // security contains admission plugins specific to cluster security.
-package security
+package security // import "k8s.io/kubernetes/plugin/pkg/admission/security"
diff --git a/plugin/pkg/admission/serviceaccount/doc.go b/plugin/pkg/admission/serviceaccount/doc.go
index 54d763bb90953..4bd511699a943 100644
--- a/plugin/pkg/admission/serviceaccount/doc.go
+++ b/plugin/pkg/admission/serviceaccount/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // serviceaccount enforces all pods having an associated serviceaccount,
 // and all containers mounting the API token for that serviceaccount at a known location
-package serviceaccount
+package serviceaccount // import "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
diff --git a/plugin/pkg/auth/authenticator/doc.go b/plugin/pkg/auth/authenticator/doc.go
index 914620082068c..8d69b6771a17d 100644
--- a/plugin/pkg/auth/authenticator/doc.go
+++ b/plugin/pkg/auth/authenticator/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package authenticator contains implementations for pkg/auth/authenticator interfaces
-package authenticator
+package authenticator // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator"
diff --git a/plugin/pkg/auth/authenticator/password/doc.go b/plugin/pkg/auth/authenticator/password/doc.go
index 84c1fb89196bd..7b6cc1a299838 100644
--- a/plugin/pkg/auth/authenticator/password/doc.go
+++ b/plugin/pkg/auth/authenticator/password/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package password contains authenticator.Password implementations
-package password
+package password // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password"
diff --git a/plugin/pkg/auth/authenticator/password/keystone/doc.go b/plugin/pkg/auth/authenticator/password/keystone/doc.go
index 6f6a93034c49d..32fe2010f9b0a 100644
--- a/plugin/pkg/auth/authenticator/password/keystone/doc.go
+++ b/plugin/pkg/auth/authenticator/password/keystone/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package keystone provides authentication via keystone.
 // For details about keystone and how to use the plugin, refer to
 // https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/admin/authentication.md
-package keystone
+package keystone // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone"
diff --git a/plugin/pkg/auth/authenticator/request/x509/doc.go b/plugin/pkg/auth/authenticator/request/x509/doc.go
index 570c1ac59902d..807b016fd3d4e 100644
--- a/plugin/pkg/auth/authenticator/request/x509/doc.go
+++ b/plugin/pkg/auth/authenticator/request/x509/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package x509 provides a request authenticator that validates and
 // extracts user information from client certificates
-package x509
+package x509 // import "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509"
diff --git a/plugin/pkg/auth/authorizer/doc.go b/plugin/pkg/auth/authorizer/doc.go
index 448590585cda1..6640410ce3c90 100644
--- a/plugin/pkg/auth/authorizer/doc.go
+++ b/plugin/pkg/auth/authorizer/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package authorizer contains implementations for pkg/auth/authorizer interfaces
-package authorizer
+package authorizer // import "k8s.io/kubernetes/plugin/pkg/auth/authorizer"
diff --git a/plugin/pkg/auth/doc.go b/plugin/pkg/auth/doc.go
index de816611ebf2c..fe2098f9bdc44 100644
--- a/plugin/pkg/auth/doc.go
+++ b/plugin/pkg/auth/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package auth contains implementations for interfaces in the pkg/auth package
-package auth
+package auth // import "k8s.io/kubernetes/plugin/pkg/auth"
diff --git a/plugin/pkg/scheduler/algorithm/doc.go b/plugin/pkg/scheduler/algorithm/doc.go
index 6d63763f42e47..299051b0f8afe 100644
--- a/plugin/pkg/scheduler/algorithm/doc.go
+++ b/plugin/pkg/scheduler/algorithm/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package scheduler contains a generic Scheduler interface and several
 // implementations.
-package algorithm
+package algorithm // import "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
diff --git a/test/e2e_node/doc.go b/test/e2e_node/doc.go
index c4714893bac9e..60976fbb5782c 100644
--- a/test/e2e_node/doc.go
+++ b/test/e2e_node/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // e2e_node contains e2e tests specific to the node
 // TODO: rename this package e2e-node
-package e2e_node
+package e2e_node // import "k8s.io/kubernetes/test/e2e_node"
diff --git a/test/integration/doc.go b/test/integration/doc.go
index 737533f58ef12..01270cfdd9dda 100644
--- a/test/integration/doc.go
+++ b/test/integration/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package integration provides integration tests for Kubernetes.  Use the integration
 // build tag during `go test` to start the tests.  Some tests require a running etcd
 // or Docker installation on the system which you can skip with no-docker and no-etcd.
-package integration
+package integration // import "k8s.io/kubernetes/test/integration"