diff --git a/Makefile b/Makefile
index c3dda9d28..bbc64b6a0 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@ docs: build
 .PHONY: clean
 clean:
 	@rm -rf $(BINDIR) ./rootfs/tiller ./_dist
+	@rm -rf ./rootfs/tiller
 
 .PHONY: coverage
 coverage:
diff --git a/Makefile.orig b/Makefile.orig
new file mode 100644
index 000000000..e1758b177
--- /dev/null
+++ b/Makefile.orig
@@ -0,0 +1,121 @@
+DOCKER_REGISTRY ?= gcr.io
+IMAGE_PREFIX    ?= kubernetes-helm
+SHORT_NAME      ?= tiller
+TARGETS         = darwin/amd64 linux/amd64 linux/386
+DIST_DIRS       = find * -type d -exec
+
+# go option
+GO        ?= go
+PKG       := $(shell glide novendor)
+TAGS      :=
+TESTS     := .
+TESTFLAGS :=
+LDFLAGS   :=
+GOFLAGS   :=
+BINDIR    := $(CURDIR)/bin
+BINARIES  := helm tiller
+
+# Required for globs to work correctly
+SHELL=/bin/bash
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build:
+	GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/...
+
+# usage: make build-cross dist VERSION=v2.0.0-alpha.3
+.PHONY: build-cross
+build-cross:
+	gox -output="_dist/{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm
+
+.PHONY: dist
+dist:
+	( \
+		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: checksum
+checksum:
+	for f in _dist/*.{gz,zip} ; do \
+		shasum -a 256 "$${f}"  | awk '{print $$1}' > "$${f}.sha256" ; \
+	done
+
+.PHONY: check-docker
+check-docker:
+	@if [ -z $$(which docker) ]; then \
+	  echo "Missing \`docker\` client which is required for development"; \
+	  exit 2; \
+	fi
+
+.PHONY: docker-binary
+docker-binary: BINDIR = ./rootfs
+docker-binary: GOFLAGS += -a -installsuffix cgo
+docker-binary:
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller
+
+.PHONY: docker-build
+docker-build: check-docker docker-binary
+	docker build --rm -t ${IMAGE} rootfs
+	docker tag ${IMAGE} ${MUTABLE_IMAGE}
+
+.PHONY: test
+test: build
+test: TESTFLAGS += -race -v
+test: test-style
+test: test-unit
+
+.PHONY: test-unit
+test-unit:
+	HELM_HOME=/no/such/dir $(GO) test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS)
+
+.PHONY: test-style
+test-style:
+	@scripts/validate-go.sh
+	@scripts/validate-license.sh
+
+.PHONY: protoc
+protoc:
+	$(MAKE) -C _proto/ all
+
+.PHONY: clean
+clean:
+<<<<<<< HEAD
+	@rm -rf $(BINDIR)
+	@rm -rf ./rootfs/tiller
+=======
+	@rm -rf $(BINDIR) ./rootfs/tiller ./_dist
+>>>>>>> master
+
+.PHONY: coverage
+coverage:
+	@scripts/coverage.sh
+
+HAS_GLIDE := $(shell command -v glide;)
+HAS_GOX := $(shell command -v gox;)
+HAS_HG := $(shell command -v hg;)
+HAS_GIT := $(shell command -v git;)
+
+.PHONY: bootstrap
+bootstrap:
+ifndef HAS_GLIDE
+	go get -u github.com/Masterminds/glide
+endif
+ifndef HAS_GOX
+	go get -u github.com/mitchellh/gox
+endif
+ifndef HAS_HG
+	$(error You must install Mercurial (hg))
+endif
+ifndef HAS_GIT
+	$(error You must install Git)
+endif
+	glide install --strip-vendor
+	go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go
+
+include versioning.mk