diff --git a/hack/update-staging-godeps.sh b/hack/update-staging-godeps.sh
index 18f1ddd51b..03c7ec1be8 100755
--- a/hack/update-staging-godeps.sh
+++ b/hack/update-staging-godeps.sh
@@ -94,9 +94,9 @@ for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do
   updateGodepManifest "${repo}"
 
   if [ "${FAIL_ON_DIFF}" == true ]; then
-    diff --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json"
+    diff --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps/Godeps.json" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json"
   fi
   if [ "${DRY_RUN}" != true ]; then
-    cp "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps"
+    cp "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps/Godeps.json"
   fi
 done
diff --git a/staging/src/k8s.io/api/Godeps/Readme b/staging/src/k8s.io/api/Godeps/Readme
new file mode 100644
index 0000000000..4cdaa53d56
--- /dev/null
+++ b/staging/src/k8s.io/api/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme
new file mode 100644
index 0000000000..4cdaa53d56
--- /dev/null
+++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/staging/src/k8s.io/kube-gen/Godeps b/staging/src/k8s.io/kube-gen/Godeps/Godeps.json
similarity index 100%
rename from staging/src/k8s.io/kube-gen/Godeps
rename to staging/src/k8s.io/kube-gen/Godeps/Godeps.json
diff --git a/staging/src/k8s.io/kube-gen/Godeps/Readme b/staging/src/k8s.io/kube-gen/Godeps/Readme
new file mode 100644
index 0000000000..4cdaa53d56
--- /dev/null
+++ b/staging/src/k8s.io/kube-gen/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/staging/src/k8s.io/metrics/Godeps b/staging/src/k8s.io/metrics/Godeps/Godeps.json
similarity index 100%
rename from staging/src/k8s.io/metrics/Godeps
rename to staging/src/k8s.io/metrics/Godeps/Godeps.json
diff --git a/staging/src/k8s.io/metrics/Godeps/Readme b/staging/src/k8s.io/metrics/Godeps/Readme
new file mode 100644
index 0000000000..4cdaa53d56
--- /dev/null
+++ b/staging/src/k8s.io/metrics/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.