diff --git a/pkg/fsutil/fs.go b/pkg/fsutil/fs.go
index f1a26a411..0795f0f0f 100644
--- a/pkg/fsutil/fs.go
+++ b/pkg/fsutil/fs.go
@@ -1,8 +1,22 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license.
+/*
+Copyright (c) for portions of fs.go are held by The Go Authors, 2016 and are provided under
+the BSD license.
 
-// Licensed under the Apache License, Version 2.0 (the "License");
+https://github.com/golang/go/blob/master/LICENSE
+
+Copyright The Helm Authors.
+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 fs
 
diff --git a/pkg/fsutil/fs_test.go b/pkg/fsutil/fs_test.go
index 8093eea48..2f7d16e0e 100644
--- a/pkg/fsutil/fs_test.go
+++ b/pkg/fsutil/fs_test.go
@@ -1,8 +1,22 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license.
+/*
+Copyright (c) for portions of fs_test.go are held by The Go Authors, 2016 and are provided under
+the BSD license.
 
-// Licensed under the Apache License, Version 2.0 (the "License");
+https://github.com/golang/go/blob/master/LICENSE
+
+Copyright The Helm Authors.
+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 fs
diff --git a/pkg/fsutil/rename.go b/pkg/fsutil/rename.go
index 059e027ee..18df9ce7e 100644
--- a/pkg/fsutil/rename.go
+++ b/pkg/fsutil/rename.go
@@ -1,8 +1,22 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license.
+/*
+Copyright (c) for portions of rename.go are held by The Go Authors, 2016 and are provided under
+the BSD license.
 
-// Licensed under the Apache License, Version 2.0 (the "License");
+https://github.com/golang/go/blob/master/LICENSE
+
+Copyright The Helm Authors.
+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.
+*/
 
 // +build !windows
 
diff --git a/pkg/fsutil/rename_windows.go b/pkg/fsutil/rename_windows.go
index c8491e94a..26b35a334 100644
--- a/pkg/fsutil/rename_windows.go
+++ b/pkg/fsutil/rename_windows.go
@@ -1,8 +1,22 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license.
+/*
+Copyright (c) for portions of rename_windows.go are held by The Go Authors, 2016 and are provided under
+the BSD license.
 
-// Licensed under the Apache License, Version 2.0 (the "License");
+https://github.com/golang/go/blob/master/LICENSE
+
+Copyright The Helm Authors.
+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.
+*/
 
 // +build windows