diff --git a/hack/godep-save.sh b/hack/godep-save.sh
index 8ce6026cc7d..ef2988ef572 100755
--- a/hack/godep-save.sh
+++ b/hack/godep-save.sh
@@ -52,6 +52,7 @@ pushd "${KUBE_ROOT}" > /dev/null
     exit 1
   fi
 
+  echo "Running godep save. This will take around 15 minutes."
   GOPATH=${GOPATH}:${KUBE_ROOT}/staging godep save "${REQUIRED_BINS[@]}"
 
   # create a symlink in vendor directory pointing to the staging client. This
@@ -63,4 +64,10 @@ pushd "${KUBE_ROOT}" > /dev/null
   done
 popd > /dev/null
 
-echo "Don't forget to run hack/update-godep-licenses.sh if you added or removed a dependency!"
+# Workaround broken symlink in docker repo because godep copies the link, but not the target
+rm -rf ${KUBE_ROOT}/vendor/github.com/docker/docker/project/
+
+echo
+echo "Don't forget to run:"
+echo "- hack/update-bazel.sh to recreate the BUILD files"
+echo "- hack/update-godep-licenses.sh if you added or removed a dependency!"