diff --git a/.circleci/config.yml b/.circleci/config.yml
index 14c050746..c437b8c33 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
     working_directory: /go/src/k8s.io/helm
     parallelism: 3
     docker:
-      - image: golang:1.12.5
+      - image: golang:1.13.1
     environment:
       PROJECT_NAME: "kubernetes-helm"
     steps:
diff --git a/Makefile b/Makefile
index fc175a781..a1a358c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DOCKER_REGISTRY   ?= gcr.io
 IMAGE_PREFIX      ?= kubernetes-helm
-DEV_IMAGE         ?= golang:1.12.5
+DEV_IMAGE         ?= golang:1.13.1
 SHORT_NAME        ?= tiller
 SHORT_NAME_RUDDER ?= rudder
 TARGETS           ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
diff --git a/pkg/chartutil/capabilities_versions_generated.go b/pkg/chartutil/capabilities_versions_generated.go
index bc33a40e8..370ad216c 100644
--- a/pkg/chartutil/capabilities_versions_generated.go
+++ b/pkg/chartutil/capabilities_versions_generated.go
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 // Code generated by capabilities_default_versions_generate.go; DO NOT EDIT.
+
 package chartutil
 
 func defaultVersions() []string {
diff --git a/pkg/chartutil/generator/capabilities_default_versions_generate.go b/pkg/chartutil/generator/capabilities_default_versions_generate.go
index 4ed312465..165a69a95 100644
--- a/pkg/chartutil/generator/capabilities_default_versions_generate.go
+++ b/pkg/chartutil/generator/capabilities_default_versions_generate.go
@@ -60,7 +60,7 @@ func createOutput(v []string) []byte {
 	var out bytes.Buffer
 
 	fmt.Fprintln(&out, licenseHeader)
-	fmt.Fprintln(&out, "// Code generated by capabilities_default_versions_generate.go; DO NOT EDIT.")
+	fmt.Fprint(&out, "// Code generated by capabilities_default_versions_generate.go; DO NOT EDIT.\n\n")
 	fmt.Fprint(&out, "package chartutil\n\n")
 	fmt.Fprintln(&out, "func defaultVersions() []string {")
 	fmt.Fprintln(&out, "\treturn []string{")
diff --git a/scripts/validate-license.sh b/scripts/validate-license.sh
index 12c76f75c..c4f02ba3e 100755
--- a/scripts/validate-license.sh
+++ b/scripts/validate-license.sh
@@ -27,7 +27,7 @@ find_files() {
   \( -name '*.go' -o -name '*.sh' -o -name 'Dockerfile' \)
 }
 
-failed_license_header=($(find_files | xargs grep -L 'Licensed under the Apache License, Version 2.0 (the "License");'))
+failed_license_header=($(grep -L 'Licensed under the Apache License, Version 2.0 (the "License");' $(find_files))) || :
 if (( ${#failed_license_header[@]} > 0 )); then
   echo "Some source files are missing license headers."
   for f in "${failed_license_header[@]}"; do
@@ -36,7 +36,7 @@ if (( ${#failed_license_header[@]} > 0 )); then
   exit 1
 fi
 
-failed_copyright_header=($(find_files | xargs grep -L 'Copyright The Helm Authors.'))
+failed_copyright_header=($(grep -L 'Copyright The Helm Authors.' $(find_files))) || :
 if (( ${#failed_copyright_header[@]} > 0 )); then
   echo "Some source files are missing the copyright header."
   for f in "${failed_copyright_header[@]}"; do