diff --git a/build/make-binaries.sh b/build/make-binaries.sh
index 7402228877e2b..7df9d121649a0 100755
--- a/build/make-binaries.sh
+++ b/build/make-binaries.sh
@@ -28,3 +28,4 @@ source "$KUBE_ROOT/build/common.sh"
 kube::build::verify_prereqs
 kube::build::build_image
 kube::build::run_build_command build/build-image/make-binaries.sh "$@"
+kube::build::copy_output
diff --git a/build/make-cross.sh b/build/make-cross.sh
index a739af83b9ab6..730df7521fa8d 100755
--- a/build/make-cross.sh
+++ b/build/make-cross.sh
@@ -29,3 +29,4 @@ source "$KUBE_ROOT/build/common.sh"
 kube::build::verify_prereqs
 kube::build::build_image
 kube::build::run_build_command build/build-image/make-cross.sh
+kube::build::copy_output
diff --git a/cluster/kubecfg.sh b/cluster/kubecfg.sh
index c4013df925e2f..aed47ae0341b4 100755
--- a/cluster/kubecfg.sh
+++ b/cluster/kubecfg.sh
@@ -62,13 +62,18 @@ kubecfg="${KUBE_ROOT}/_output/build/${host_os}/${host_arch}/kubecfg"
 if [[ ! -x "$kubecfg" ]]; then
   kubecfg="${KUBE_ROOT}/platforms/${host_os}/${host_arch}/kubecfg"
 fi
+
 if [[ ! -x "$kubecfg" ]]; then
-  echo "It looks as if you don't have a compiled version of Kubernetes.  If you" >&2
-  echo "are running from a clone of the git repo, please run ./build/make-cross.sh." >&2
-  echo "Note that this requires having Docker installed.  If you are running " >&2
-  echo "from a release tarball, something is wrong.  Look at " >&2
-  echo "http://kubernetes.io/ for information on how to contact the "
-  echo "development team for help." >&2
+  {
+    echo "It looks as if you don't have a compiled kubecfg binary."
+    echo
+    echo "If you are running from a clone of the git repo, please run"
+    echo "'./build/make-cross.sh'. Note that this requires having Docker installed."
+    echo
+    echo "If you are running from a binary release tarball, something is wrong. "
+    echo "Look at http://kubernetes.io/ for information on how to contact the "
+    echo "development team for help."
+  } >&2
   exit 1
 fi