diff --git a/hack/update-codecgen.sh b/hack/update-codecgen.sh
index c4de17fa776..f15cfa30f4a 100755
--- a/hack/update-codecgen.sh
+++ b/hack/update-codecgen.sh
@@ -35,11 +35,11 @@ generated_files=$(
 
 # Build codecgen binary from Godeps.
 function cleanup {
-  rm -rf "${KUBE_ROOT}/codecgen_binary"
+  rm -f "${CODECGEN:-}"
 }
 trap cleanup EXIT
-godep go build -o codecgen_binary github.com/ugorji/go/codec/codecgen
 CODECGEN="${PWD}/codecgen_binary"
+godep go build -o "${CODECGEN}" github.com/ugorji/go/codec/codecgen
 
 for generated_file in ${generated_files}; do
   initial_dir=${PWD}
diff --git a/hack/verify-codecgen.sh b/hack/verify-codecgen.sh
index 0ac250a69f5..0b1e12551c9 100755
--- a/hack/verify-codecgen.sh
+++ b/hack/verify-codecgen.sh
@@ -45,15 +45,19 @@ function cleanup {
 }
 trap cleanup EXIT
 
-# build codecgen tool
+# Build codecgen from Godeps.
+# However, we need to install godep first.
 # We make some tricks with GOPATH variable to make it work with Travis.
 _gopath=${GOPATH}
 export GOPATH="${_tmpdir}"
-go get -u github.com/ugorji/go/codec/codecgen 2>/dev/null
-go install github.com/ugorji/go/codec/codecgen 2>/dev/null
-CODECGEN="${_tmpdir}/bin/codecgen"
+go get -u github.com/tools/godep 2>/dev/null
+go install github.com/tools/godep 2>/dev/null
+GODEP="${_tmpdir}/bin/godep"
 export GOPATH=${_gopath}
 
+CODECGEN="${_tmpdir}/codecgen_binary"
+${GODEP} go build -o "${CODECGEN}" github.com/ugorji/go/codec/codecgen
+
 for generated_file in ${generated_files}; do
   initial_dir=${PWD}
   file=${generated_file//\.generated\.go/.go}