diff --git a/.generated_files b/.generated_files
index 7d1966f458e..4e417ab3d25 100644
--- a/.generated_files
+++ b/.generated_files
@@ -22,6 +22,5 @@ file-name	generated.pb.go
 file-name	generated.proto
 file-name	types_swagger_doc_generated.go
 
-path-prefix	Godeps/
 path-prefix	vendor/
 path-prefix	pkg/generated/
diff --git a/.gitignore b/.gitignore
index 9082818340a..86636ffae60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,9 +125,6 @@ zz_generated_*_test.go
 # This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored
 !\.drone\.sec
 
-# Godeps workspace
-/Godeps/_workspace
-
 /bazel-*
 *.pyc
 
diff --git a/build/common.sh b/build/common.sh
index 2aa941b2741..5368f98f6f0 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -730,7 +730,6 @@ function kube::build::copy_output() {
     --prune-empty-dirs \
     --filter='- /_temp/' \
     --filter='+ /vendor/' \
-    --filter='+ /Godeps/' \
     --filter='+ /staging/***/Godeps/**' \
     --filter='+ /_output/dockerized/bin/**' \
     --filter='+ zz_generated.*' \
diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py
index 2c03451a9b4..5a6d3177eb1 100755
--- a/hack/boilerplate/boilerplate.py
+++ b/hack/boilerplate/boilerplate.py
@@ -155,7 +155,7 @@ def file_extension(filename):
     return os.path.splitext(filename)[1].split(".")[-1].lower()
 
 
-skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh',
+skipped_dirs = ['third_party', '_gopath', '_output', '.git', 'cluster/env.sh',
                 "vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test",
                 "staging/src/k8s.io/kubectl/pkg/generated/bindata.go"]
 
diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh
index e42288ae175..e38b64768be 100755
--- a/hack/make-rules/helpers/cache_go_dirs.sh
+++ b/hack/make-rules/helpers/cache_go_dirs.sh
@@ -46,8 +46,7 @@ function kfind() {
             \(                     \
                 -path ./_\* -o     \
                 -path ./.\* -o     \
-                -path ./vendor -o  \
-                -path ./Godeps     \
+                -path ./vendor     \
             \) -prune              \
         \)                         \
         \)                         \