diff --git a/pkg/hapi/chart/chart.go b/pkg/hapi/chart/chart.go
index cb87ac4676ae85d7a2936858550fc98c5cc118f0..a74df58e6174278ff0a8973f91bf32fa07a3e14a 100644
--- a/pkg/hapi/chart/chart.go
+++ b/pkg/hapi/chart/chart.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package chart
 
 // 	Chart is a helm package that contains metadata, a default config, zero or more
diff --git a/pkg/hapi/chart/file.go b/pkg/hapi/chart/file.go
index 1f80f00f625344100da36347b31bc41c681a1811..90edd59f108f091fc15cbaa35f12d49293d767a4 100644
--- a/pkg/hapi/chart/file.go
+++ b/pkg/hapi/chart/file.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package chart
 
 // File represents a file as a name/value pair.
diff --git a/pkg/hapi/chart/metadata.go b/pkg/hapi/chart/metadata.go
index 30ffbf88692088f12f3f1356352d90fa76369c45..bd55f94d3366b9eca20eb77baf933f7caf215a12 100644
--- a/pkg/hapi/chart/metadata.go
+++ b/pkg/hapi/chart/metadata.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package chart
 
 // Maintainer describes a Chart maintainer.
diff --git a/pkg/hapi/release/hook.go b/pkg/hapi/release/hook.go
index 98a673e20dc693e56badba5f649751ec32a70558..64f04596053309e9597aea77a9220d6a028db11d 100644
--- a/pkg/hapi/release/hook.go
+++ b/pkg/hapi/release/hook.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package release
 
 import "time"
diff --git a/pkg/hapi/release/info.go b/pkg/hapi/release/info.go
index 8eaa6579cbbec9913248e9bc750baa9f1d17946d..9af601fb9b9cd8a2084dac7a383026352bc6cd4c 100644
--- a/pkg/hapi/release/info.go
+++ b/pkg/hapi/release/info.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package release
 
 import "time"
diff --git a/pkg/hapi/release/release.go b/pkg/hapi/release/release.go
index 2b10235fd00f61536d2481960ab14c1e597b63c2..f8b7394683d6be250370c84620109087996e5283 100644
--- a/pkg/hapi/release/release.go
+++ b/pkg/hapi/release/release.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package release
 
 import "k8s.io/helm/pkg/hapi/chart"
diff --git a/pkg/hapi/release/status.go b/pkg/hapi/release/status.go
index 1eebbb77424e673ab9e9386a6693c8ee9b23f33e..91c856eb9c7cc7b51209ddeb9d4afa01c8d38ad1 100644
--- a/pkg/hapi/release/status.go
+++ b/pkg/hapi/release/status.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package release
 
 type StatusCode int
diff --git a/pkg/hapi/release/test_run.go b/pkg/hapi/release/test_run.go
index b6098a8e9771d89aadffab1c915cfb07039e5806..556bf91138b82cd9098aebd92fe0fa1657ae241b 100644
--- a/pkg/hapi/release/test_run.go
+++ b/pkg/hapi/release/test_run.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package release
 
 import "time"
diff --git a/pkg/hapi/release/test_suite.go b/pkg/hapi/release/test_suite.go
index 1567f560bdd3ef6436b011c455c324ee251c6a09..26d99be261dce817847a2eb9712f3a109936d467 100644
--- a/pkg/hapi/release/test_suite.go
+++ b/pkg/hapi/release/test_suite.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package release
 
 import "time"
diff --git a/pkg/hapi/tiller.go b/pkg/hapi/tiller.go
index 0b66975b3a29250710f8c5e240c56b7461eaa2b2..56ca66ed73f6e2ea4f9aa7f298332ddc52ae2508 100644
--- a/pkg/hapi/tiller.go
+++ b/pkg/hapi/tiller.go
@@ -1,3 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package hapi
 
 import (
diff --git a/scripts/validate-go.sh b/scripts/validate-go.sh
index 2ecf5dfb3fe24a538399c2afc9a3a585b814bdac..ba593e2b7d0ded4d6d8020fd573d78e14862d729 100755
--- a/scripts/validate-go.sh
+++ b/scripts/validate-go.sh
@@ -45,7 +45,6 @@ gometalinter.v1 \
   --disable-all \
   --enable golint \
   --vendor \
-  --skip proto \
   --deadline 60s \
   ./... || :
 
diff --git a/scripts/validate-license.sh b/scripts/validate-license.sh
index fe7ec481bee7a8063885bd470bc5b7696d11e5fb..2718fec8cc89dd6d8f2162d833428dbb13b4e3ae 100755
--- a/scripts/validate-license.sh
+++ b/scripts/validate-license.sh
@@ -20,7 +20,6 @@ find_files() {
   find . -not \( \
     \( \
       -wholename './vendor' \
-      -o -wholename './pkg/proto' \
       -o -wholename '*testdata*' \
     \) -prune \
   \) \