diff --git a/hack/.spelling_failures b/hack/.spelling_failures
index 7268a1f66928..e4430dc9f917 100644
--- a/hack/.spelling_failures
+++ b/hack/.spelling_failures
@@ -11,6 +11,7 @@ generated.proto
 pkg/client/clientset_generated
 pkg/client/informers/informers_generated/
 pkg/generated
+pkg/kubectl/generated
 swagger
 test/e2e/generated
 third_party/
diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py
index d90abd44a783..594d71ca0cdf 100755
--- a/hack/boilerplate/boilerplate.py
+++ b/hack/boilerplate/boilerplate.py
@@ -147,7 +147,7 @@ def file_extension(filename):
 
 skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh',
                 "vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test",
-                "pkg/generated/bindata.go"]
+                "pkg/kubectl/generated/bindata.go"]
 
 # list all the files contain 'DO NOT EDIT', but are not generated
 skipped_ungenerated_files = ['hack/build-ui.sh', 'hack/lib/swagger.sh',
diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh
index f5153cfc5c1b..53010175d662 100755
--- a/hack/generate-bindata.sh
+++ b/hack/generate-bindata.sh
@@ -64,7 +64,7 @@ fi
 rm -f "${BINDATA_OUTPUT}.tmp"
 
 # These are files for runtime code
-BINDATA_OUTPUT="pkg/generated/bindata.go"
+BINDATA_OUTPUT="pkg/kubectl/generated/bindata.go"
 # IMPORTANT: if you make any changes to these arguments, you must also update
 # pkg/generated/BUILD and/or build/bindata.bzl.
 go-bindata -nometadata -nocompress -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD
index b993d1c12bf6..eba1de759c35 100644
--- a/pkg/kubectl/BUILD
+++ b/pkg/kubectl/BUILD
@@ -118,6 +118,7 @@ filegroup(
         "//pkg/kubectl/describe:all-srcs",
         "//pkg/kubectl/explain:all-srcs",
         "//pkg/kubectl/generate:all-srcs",
+        "//pkg/kubectl/generated:all-srcs",
         "//pkg/kubectl/metricsutil:all-srcs",
         "//pkg/kubectl/polymorphichelpers:all-srcs",
         "//pkg/kubectl/proxy:all-srcs",
diff --git a/pkg/kubectl/generated/BUILD b/pkg/kubectl/generated/BUILD
new file mode 100644
index 000000000000..9ab5fd6ccddc
--- /dev/null
+++ b/pkg/kubectl/generated/BUILD
@@ -0,0 +1,22 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["bindata.go"],
+    importpath = "k8s.io/kubernetes/pkg/kubectl/generated",
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
diff --git a/pkg/generated/bindata.go b/pkg/kubectl/generated/bindata.go
similarity index 100%
rename from pkg/generated/bindata.go
rename to pkg/kubectl/generated/bindata.go
diff --git a/pkg/kubectl/util/i18n/BUILD b/pkg/kubectl/util/i18n/BUILD
index 366fd39d718f..fd48ae70cb95 100644
--- a/pkg/kubectl/util/i18n/BUILD
+++ b/pkg/kubectl/util/i18n/BUILD
@@ -11,7 +11,7 @@ go_library(
     srcs = ["i18n.go"],
     importpath = "k8s.io/kubernetes/pkg/kubectl/util/i18n",
     deps = [
-        "//pkg/generated:go_default_library",
+        "//pkg/kubectl/generated:go_default_library",
         "//vendor/github.com/chai2010/gettext-go/gettext:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
     ],
diff --git a/pkg/kubectl/util/i18n/i18n.go b/pkg/kubectl/util/i18n/i18n.go
index f1e730b6fd7c..69d742ca2434 100644
--- a/pkg/kubectl/util/i18n/i18n.go
+++ b/pkg/kubectl/util/i18n/i18n.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"strings"
 
-	"k8s.io/kubernetes/pkg/generated"
+	"k8s.io/kubernetes/pkg/kubectl/generated"
 
 	"github.com/chai2010/gettext-go/gettext"
 	"github.com/golang/glog"