diff --git a/pkg/kube/result.go b/pkg/kube/result.go
index cc222a66f..647d1f83d 100644
--- a/pkg/kube/result.go
+++ b/pkg/kube/result.go
@@ -16,7 +16,9 @@ limitations under the License.
 
 package kube // import "k8s.io/helm/pkg/kube"
 
-import "k8s.io/cli-runtime/pkg/genericclioptions/resource"
+import (
+	"k8s.io/cli-runtime/pkg/genericclioptions/resource"
+)
 
 // Result provides convenience methods for comparing collections of Infos.
 type Result []*resource.Info
diff --git a/pkg/lint/support/message.go b/pkg/lint/support/message.go
index 5efbc7a61..f997953ab 100644
--- a/pkg/lint/support/message.go
+++ b/pkg/lint/support/message.go
@@ -16,7 +16,9 @@ limitations under the License.
 
 package support
 
-import "fmt"
+import (
+	"fmt"
+)
 
 // Severity indicates the severity of a Message.
 const (
diff --git a/pkg/releaseutil/filter.go b/pkg/releaseutil/filter.go
index 458da705f..ffd53ac25 100644
--- a/pkg/releaseutil/filter.go
+++ b/pkg/releaseutil/filter.go
@@ -16,7 +16,9 @@ limitations under the License.
 
 package releaseutil // import "k8s.io/helm/pkg/releaseutil"
 
-import rspb "k8s.io/helm/pkg/proto/hapi/release"
+import (
+	rspb "k8s.io/helm/pkg/proto/hapi/release"
+)
 
 // FilterFunc returns true if the release object satisfies
 // the predicate of the underlying filter func.
diff --git a/pkg/storage/errors/errors.go b/pkg/storage/errors/errors.go
index 38662d1ca..883eed358 100644
--- a/pkg/storage/errors/errors.go
+++ b/pkg/storage/errors/errors.go
@@ -15,7 +15,9 @@ limitations under the License.
 */
 
 package errors // import "k8s.io/helm/pkg/storage/errors"
-import "fmt"
+import (
+	"fmt"
+)
 
 var (
 	// ErrReleaseNotFound indicates that a release is not found.
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 692167b83..6bc826bd1 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -16,7 +16,9 @@ limitations under the License.
 
 package version // import "k8s.io/helm/pkg/version"
 
-import "k8s.io/helm/pkg/proto/hapi/version"
+import (
+	"k8s.io/helm/pkg/proto/hapi/version"
+)
 
 var (
 	// Version is the current version of the Helm.