diff --git a/Makefile b/Makefile
index 7ab2e485b..2adc21b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ BINNAME    ?= helm
 GOPATH     = $(shell go env GOPATH)
 DEP        = $(GOPATH)/bin/dep
 GOX        = $(GOPATH)/bin/gox
+GOIMPORTS  = $(GOPATH)/bin/goimports
 
 # go option
 PKG        := ./...
@@ -81,6 +82,10 @@ verify-docs: build
 coverage:
 	@scripts/coverage.sh
 
+.PHONY: format
+format: $(GOIMPORTS)
+	go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local k8s.io/helm
+
 # ------------------------------------------------------------------------------
 #  dependencies
 
@@ -93,6 +98,9 @@ $(DEP):
 $(GOX):
 	go get -u github.com/mitchellh/gox
 
+$(GOIMPORTS):
+	go get -u golang.org/x/tools/cmd/goimports
+
 # install vendored dependencies
 vendor: Gopkg.lock
 	$(DEP) ensure -v --vendor-only
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index 6d2d63fc9..86cd7ba79 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -24,11 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/helm/pkg/tiller/environment"
-
 	shellwords "github.com/mattn/go-shellwords"
 	"github.com/spf13/cobra"
+	"k8s.io/client-go/kubernetes/fake"
 
 	"k8s.io/helm/internal/test"
 	"k8s.io/helm/pkg/action"
@@ -38,6 +36,7 @@ import (
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/storage/driver"
+	"k8s.io/helm/pkg/tiller/environment"
 )
 
 func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() }
diff --git a/cmd/helm/plugin.go b/cmd/helm/plugin.go
index b41ec6f45..e5f8d1f11 100644
--- a/cmd/helm/plugin.go
+++ b/cmd/helm/plugin.go
@@ -20,10 +20,10 @@ import (
 	"os"
 	"os/exec"
 
-	"k8s.io/helm/pkg/plugin"
-
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/plugin"
 )
 
 const pluginHelp = `
diff --git a/cmd/helm/plugin_install.go b/cmd/helm/plugin_install.go
index 0a255eecf..72be003af 100644
--- a/cmd/helm/plugin_install.go
+++ b/cmd/helm/plugin_install.go
@@ -19,12 +19,12 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/spf13/cobra"
+
 	"k8s.io/helm/cmd/helm/require"
 	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/plugin"
 	"k8s.io/helm/pkg/plugin/installer"
-
-	"github.com/spf13/cobra"
 )
 
 type pluginInstallOptions struct {
diff --git a/cmd/helm/plugin_list.go b/cmd/helm/plugin_list.go
index 31a8b57b0..a81f59be2 100644
--- a/cmd/helm/plugin_list.go
+++ b/cmd/helm/plugin_list.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 	"io"
 
-	"k8s.io/helm/pkg/helm/helmpath"
-
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 type pluginListOptions struct {
diff --git a/cmd/helm/plugin_test.go b/cmd/helm/plugin_test.go
index 537ca1ce1..e5eba1abb 100644
--- a/cmd/helm/plugin_test.go
+++ b/cmd/helm/plugin_test.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/spf13/cobra"
+
 	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/plugin"
-
-	"github.com/spf13/cobra"
 )
 
 func TestManuallyProcessArgs(t *testing.T) {
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index b793b4dbe..d75b43486 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 	"k8s.io/client-go/kubernetes/fake"
+
 	"k8s.io/helm/pkg/chart"
 	"k8s.io/helm/pkg/hapi/release"
 	"k8s.io/helm/pkg/storage"
diff --git a/pkg/action/list_test.go b/pkg/action/list_test.go
index a80b98618..fad94d67d 100644
--- a/pkg/action/list_test.go
+++ b/pkg/action/list_test.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"k8s.io/helm/pkg/hapi/release"
 	"k8s.io/helm/pkg/storage"
 )
diff --git a/pkg/helm/environment/environment_test.go b/pkg/helm/environment/environment_test.go
index 7c8b57829..f54127c6d 100644
--- a/pkg/helm/environment/environment_test.go
+++ b/pkg/helm/environment/environment_test.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/pkg/helm/helmpath"
-
 	"github.com/spf13/pflag"
+
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 func TestEnvSettings(t *testing.T) {
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 4c3a6fd65..ef2d73ae8 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -32,7 +32,7 @@ import (
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	batch "k8s.io/api/batch/v1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	extv1beta1 "k8s.io/api/extensions/v1beta1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 84dc6fc6e..47134ec95 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index 45c0d67ac..229caf436 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -22,7 +22,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	extensions "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index f0747a294..2336bc7ec 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -18,10 +18,9 @@ package lint
 
 import (
 	"strings"
+	"testing"
 
 	"k8s.io/helm/pkg/lint/support"
-
-	"testing"
 )
 
 var values map[string]interface{}
diff --git a/pkg/plugin/installer/vcs_installer_test.go b/pkg/plugin/installer/vcs_installer_test.go
index 31dc24685..f114a8a23 100644
--- a/pkg/plugin/installer/vcs_installer_test.go
+++ b/pkg/plugin/installer/vcs_installer_test.go
@@ -22,9 +22,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"k8s.io/helm/pkg/helm/helmpath"
-
 	"github.com/Masterminds/vcs"
+
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 var _ Installer = new(VCSInstaller)
diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index 546f66744..a05c4ae8e 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -23,9 +23,9 @@ import (
 	"runtime"
 	"strings"
 
-	helm_env "k8s.io/helm/pkg/helm/environment"
-
 	"github.com/ghodss/yaml"
+
+	helm_env "k8s.io/helm/pkg/helm/environment"
 )
 
 const pluginFileName = "plugin.yaml"
diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go
index 7a81805d4..876368c5b 100644
--- a/pkg/registry/client_test.go
+++ b/pkg/registry/client_test.go
@@ -21,7 +21,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"k8s.io/helm/pkg/chart"
 	"net"
 	"os"
 	"testing"
@@ -31,8 +30,9 @@ import (
 	"github.com/docker/distribution/configuration"
 	"github.com/docker/distribution/registry"
 	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
-
 	"github.com/stretchr/testify/suite"
+
+	"k8s.io/helm/pkg/chart"
 )
 
 var (
diff --git a/pkg/releasetesting/environment.go b/pkg/releasetesting/environment.go
index fcb52e84d..95336ac6b 100644
--- a/pkg/releasetesting/environment.go
+++ b/pkg/releasetesting/environment.go
@@ -22,7 +22,7 @@ import (
 	"log"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	"k8s.io/helm/pkg/hapi"
 	"k8s.io/helm/pkg/hapi/release"
diff --git a/pkg/releasetesting/test_suite.go b/pkg/releasetesting/test_suite.go
index 590f01370..3470624db 100644
--- a/pkg/releasetesting/test_suite.go
+++ b/pkg/releasetesting/test_suite.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	"k8s.io/helm/pkg/hapi/release"
 	"k8s.io/helm/pkg/hooks"
diff --git a/pkg/releasetesting/test_suite_test.go b/pkg/releasetesting/test_suite_test.go
index 4e8d152a6..3e8e8423e 100644
--- a/pkg/releasetesting/test_suite_test.go
+++ b/pkg/releasetesting/test_suite_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	"k8s.io/helm/pkg/hapi"
 	"k8s.io/helm/pkg/hapi/release"
diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go
index 17ffed330..06ba0d2bd 100644
--- a/pkg/releaseutil/manifest_sorter.go
+++ b/pkg/releaseutil/manifest_sorter.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
+
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/hapi/release"
 	"k8s.io/helm/pkg/hooks"
diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go
index d91b71b91..19a30eb3e 100644
--- a/pkg/storage/driver/cfgmaps.go
+++ b/pkg/storage/driver/cfgmaps.go
@@ -22,8 +22,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kblabels "k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/storage/driver/cfgmaps_test.go b/pkg/storage/driver/cfgmaps_test.go
index 65c6fc1dd..75938dcdc 100644
--- a/pkg/storage/driver/cfgmaps_test.go
+++ b/pkg/storage/driver/cfgmaps_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	rspb "k8s.io/helm/pkg/hapi/release"
 )
diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go
index bdb9236db..5c7f38e35 100644
--- a/pkg/storage/driver/mock_test.go
+++ b/pkg/storage/driver/mock_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go
index 1c9ee96e9..88f213a92 100644
--- a/pkg/storage/driver/secrets.go
+++ b/pkg/storage/driver/secrets.go
@@ -22,8 +22,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kblabels "k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/storage/driver/secrets_test.go b/pkg/storage/driver/secrets_test.go
index d791959d3..f32d4a394 100644
--- a/pkg/storage/driver/secrets_test.go
+++ b/pkg/storage/driver/secrets_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	rspb "k8s.io/helm/pkg/hapi/release"
 )
diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go
index 8a166fe23..b68af00c8 100644
--- a/pkg/tiller/environment/environment.go
+++ b/pkg/tiller/environment/environment.go
@@ -26,7 +26,7 @@ import (
 	"io"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions/resource"
 
 	"k8s.io/helm/pkg/kube"
diff --git a/pkg/tiller/environment/environment_test.go b/pkg/tiller/environment/environment_test.go
index fe458479f..33a53d98b 100644
--- a/pkg/tiller/environment/environment_test.go
+++ b/pkg/tiller/environment/environment_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions/resource"
 
 	"k8s.io/helm/pkg/kube"