diff --git a/.travis.yml b/.travis.yml
index 6efa61e43..b54f4fc8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ deploy:
     script: make prerelease-upload
     skip_cleanup: true
     on:
-      branch: master
+      all_branches: true
 matrix:
   allow_failures:
     - go: master
diff --git a/Makefile b/Makefile
index 48c0075a8..8be692b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ PKGS := $(shell cd $(GOPATH)/src/$(CLONE_URL); go list ./... | grep -v vendor)
 BUILD_TIME=`date -u +%FT%T%z`
 LDFLAGS="-X github.com/pilosa/pilosa.Version=$(VERSION) -X github.com/pilosa/pilosa.BuildTime=$(BUILD_TIME)"
 DOCKER_GOLANG_IMAGE=golang:latest
+BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
+BRANCH_IDENTIFIER := $(BRANCH)-$(GOOS)-$(GOARCH)
 
 default: test pilosa
 
@@ -75,16 +77,16 @@ else
 endif
 
 prerelease-build: vendor
-	make pilosa FLAGS="-o build/pilosa-master-$(GOOS)-$(GOARCH)/pilosa"
-	cp LICENSE README.md build/pilosa-master-$(GOOS)-$(GOARCH)
-	tar -cvz -C build -f build/pilosa-master-$(GOOS)-$(GOARCH).tar.gz pilosa-master-$(GOOS)-$(GOARCH)/
-	@echo "Created pre-release build: build/pilosa-master-$(GOOS)-$(GOARCH).tar.gz"
+	make pilosa FLAGS="-o build/pilosa-$(BRANCH_IDENTIFIER)/pilosa"
+	cp LICENSE README.md build/pilosa-$(BRANCH_IDENTIFIER)
+	tar -cvz -C build -f build/pilosa-$(BRANCH_IDENTIFIER).tar.gz pilosa-$(BRANCH_IDENTIFIER)/
+	@echo "Created pre-release build: build/pilosa-$(BRANCH_IDENTIFIER).tar.gz"
 
 prerelease:
 	make prerelease-build GOOS=linux GOARCH=amd64
 
 prerelease-upload: prerelease
-	aws s3 cp build/pilosa-master-linux-amd64.tar.gz s3://build.pilosa.com/pilosa-master-linux-amd64.tar.gz --acl public-read
+	aws s3 cp build/pilosa-$(BRANCH_IDENTIFIER).tar.gz s3://build.pilosa.com/pilosa-$(BRANCH_IDENTIFIER).tar.gz --acl public-read
 
 install: vendor
 	go install -ldflags $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosa