diff --git a/.travis.yml b/.travis.yml
index 1dcbd41c..ddfbf603 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,14 +69,15 @@ jobs:
         - sudo apt-get clean
         - sudo ln -s /usr/local/cuda-6.5/ ${CUDA_HOME}
       script:
-        - mkdir -p f5c-${TRAVIS_TAG}-bin
-        - make cuda=1 && mv f5c f5c-${TRAVIS_TAG}-bin/f5c_x86_64_linux_cuda && make clean
-        - make && mv f5c f5c-${TRAVIS_TAG}-bin/f5c_x86_64_linux
-        - cp -r README.md LICENSE docs f5c-${TRAVIS_TAG}-bin/
-        - mkdir -p f5c-${TRAVIS_TAG}-bin/scripts
-        - cp scripts/common.sh scripts/test.awk scripts/test.sh f5c-${TRAVIS_TAG}-bin/scripts
-        - tar -zcf f5c-${TRAVIS_TAG}-bin.tar.gz f5c-${TRAVIS_TAG}-bin
-        - rm -rf f5c-${TRAVIS_TAG}-bin
+        - make dist
+        - mkdir -p f5c-${TRAVIS_TAG}
+        - make cuda=1 && mv f5c f5c-${TRAVIS_TAG}/f5c_x86_64_linux_cuda && make clean
+        - make && mv f5c f5c-${TRAVIS_TAG}/f5c_x86_64_linux
+        - cp -r README.md LICENSE docs f5c-${TRAVIS_TAG}/
+        - mkdir -p f5c-${TRAVIS_TAG}/scripts
+        - cp scripts/common.sh scripts/test.awk scripts/test.sh f5c-${TRAVIS_TAG}/scripts
+        - tar -zcf f5c-${TRAVIS_TAG}-binaries.tar.gz f5c-${TRAVIS_TAG}
+        - rm -rf f5c-${TRAVIS_TAG}
       deploy:
         provider: releases
         api_key:
@@ -89,4 +90,4 @@ jobs:
           repo: hasindu2008/f5c
           tags: true
       before_deploy:
-        - make dist
+        - make clean
diff --git a/Makefile b/Makefile
index 49f32458..89fde107 100644
--- a/Makefile
+++ b/Makefile
@@ -125,19 +125,19 @@ dist: distclean
 		installdeps.mk src docs build .dockerignore configure f5c-$(VERSION)
 	mkdir -p f5c-$(VERSION)/scripts
 	cp scripts/install-hdf5.sh scripts/install-hts.sh scripts/test.sh scripts/common.sh scripts/test.awk f5c-$(VERSION)/scripts
-	tar -zcf f5c-$(VERSION).tar.gz f5c-$(VERSION)
+	tar -zcf f5c-$(VERSION)-release.tar.gz f5c-$(VERSION)
 	rm -rf f5c-$(VERSION)
 
 binary: 
-	mkdir -p f5c-$(VERSION)-bin
+	mkdir -p f5c-$(VERSION)
 	make clean
-	make cuda=1 && mv f5c f5c-$(VERSION)-bin/f5c_x86_64_linux_cuda && make clean
-	make && mv f5c f5c-$(VERSION)-bin/f5c_x86_64_linux
-	cp -r README.md LICENSE docs f5c-$(VERSION)-bin/
-	mkdir -p f5c-$(VERSION)-bin/scripts
-	cp scripts/test.sh scripts/common.sh scripts/test.awk f5c-$(VERSION)-bin/scripts
-	tar -zcf f5c-$(VERSION)-bin.tar.gz f5c-$(VERSION)-bin
-	rm -rf f5c-$(VERSION)-bin
+	make cuda=1 && mv f5c f5c-$(VERSION)/f5c_x86_64_linux_cuda && make clean
+	make && mv f5c f5c-$(VERSION)/f5c_x86_64_linux
+	cp -r README.md LICENSE docs f5c-$(VERSION)/
+	mkdir -p f5c-$(VERSION)/scripts
+	cp scripts/test.sh scripts/common.sh scripts/test.awk f5c-$(VERSION)/scripts
+	tar -zcf f5c-$(VERSION)-binaries.tar.gz f5c-$(VERSION)
+	rm -rf f5c-$(VERSION)
 
 install: $(BINARY)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin