diff --git a/Makefile b/Makefile
index 74bf76541..7cf4c55b5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ LDFLAGS   :=
 GOFLAGS   :=
 BINDIR    := $(CURDIR)/bin
 BINARIES  := helm tiller
+DIST_DIRS := find * -type d -exec
 
 .PHONY: all
 all: build
@@ -22,7 +23,18 @@ build:
 
 .PHONY: build-cross
 build-cross:
-	gox -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -os="darwin linux" -arch="amd64 386" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/...
+	gox -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -os="darwin linux windows" -arch="amd64 386" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/...
+
+# usage: make dist VERSION=v2.0.0-alpha.3
+.PHONY: dist
+dist: build-cross
+	( \
+		cd _dist && \
+		$(DIST_DIRS) cp ../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf helm-${VERSION}-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r helm-${VERSION}-{}.zip {} \; \
+	)
 
 .PHONY: check-docker
 check-docker:
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 128b9a468..71730852a 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -23,4 +23,4 @@ package version // import "k8s.io/helm/pkg/version"
 // Increment major number for new feature additions and behavioral changes.
 // Increment minor number for bug fixes and performance enhancements.
 // Increment patch number for critical fixes to existing releases.
-var Version = "v2.0.0-alpha.2"
+var Version = "v2.0.0-alpha.3"