diff --git a/.travis.yml b/.travis.yml
index dddb655..1c6ee29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ deploy:
   api_key:
     secure: droCQz8Kq5hL69V+aLKG5/taEDqVRzoZEvN/k/0Y+dEqEl3EA5D5fOcttIkTFbRSA/wzq1Nlp+LQ4HSrAGoe3Ao+1+5jkOl1FkQqdsbVI+gjge9NJdhvClYmyp9PKl0ShzckRERlOKKSKwuRjN3CHMXccTO4BLZD6QLOLFy3psdes+eruOcv8DMcZ4FFzpO9GLgmKRrYJDWuxZkgBX5Vlj0e7SiLfSJjqUt2E1HvQuS1jZYDCV2Q9hlZyCo0pgfHPRQ9WYKCUUikXPIcX/FoHDIjIyD+Tj9514ucGFPp56gvbsXQX1818r8rlmD4HWFzZK7+wwaoRUxfcIbQCtT5GI297n8H8mdhL/b3Vg4Rm7awNXYDQYcjLaKgztPaavTUZyj9w9HhMMLs567UwbhaD3mzdYQ5j7NuZvojc7fBPGPrkuY613jDdmjBzYQZAQnE6/w8wqscQ3CGRXSHavZ+zfC59o3FTbkazkR1lp4mSAtnl3306zOLk9QIlCvItlq+AxIgk/WMpIELgEucBws39BhMgqypB50rG7Vpd8SGMU1MnZ5VeK8ltBXL9eUqC4SIQ6qAK8/CZADUsy2fyWbHL9Cbg937fsvZ0D/5lMbhDC9k+TxyJWpskMTyVQ70d/Cx16OQ73flPKMbsOmKjsaYXe8CFGFmYKgqKGBp8vJeSTs=
   file: 
-    - artifacts/mortadelo_${TRAVIS_TAG}_darwin_amd64.tar.gz
-    - artifacts/mortadelo_${TRAVIS_TAG}_linux_amd64.tar.gz
+    - artifacts/mortadelo_${TRAVIS_TAG}_darwin_amd64.tgz
+    - artifacts/mortadelo_${TRAVIS_TAG}_linux_amd64.tgz
   on:
     repo: ivanfoo/mortadelo
     tags: true
diff --git a/Makefile b/Makefile
index a6cecf5..c156a34 100644
--- a/Makefile
+++ b/Makefile
@@ -53,20 +53,18 @@ test-coverage:
 
 packages:
 	for os in $(PKG_OS); do \
-		for arch in $(PKG_ARCH); do \
+		cd $(BUILD_PATH); \
+		mkdir -p $(ARTIFACTS_PATH)/$(PROJECT)_$${os}_$${arch}; \
+		for cmd in $(COMMANDS); do \
+			if [ -d "$${cmd}" ]; then \
+				cd $${cmd}; \
+			fi; \
+			GOOS=$${os} GOARCH=$${arch} $(GOCMD) build -ldflags \
+			"-X main.version=$(BRANCH) -X main.build=$(BUILD) -X main.commit=$(COMMIT)" \
+			-o "$(ARTIFACTS_PATH)/$(PROJECT)_$${os}_$${arch}/`basename $${PWD}`" .; \
 			cd $(BUILD_PATH); \
-			mkdir -p $(ARTIFACTS_PATH)/$(PROJECT)_$${os}_$${arch}; \
-			for cmd in $(COMMANDS); do \
-				if [ -d "$${cmd}" ]; then \
-					cd $${cmd}; \
-				fi; \
-				GOOS=$${os} GOARCH=$${arch} $(GOCMD) build -ldflags \
-				"-X main.version=$(BRANCH) -X main.build=$(BUILD) -X main.commit=$(COMMIT)" \
-				-o "$(ARTIFACTS_PATH)/$(PROJECT)_$${os}_$${arch}/`basename $${PWD}`" .; \
-				cd $(BUILD_DIR); \
-			done; \
-			cd $(ARTIFACTS_PATH); \
-			tar -cvzf $(PROJECT)_$(BRANCH)_$${os}_$${arch}.tar.gz $(PROJECT)_$${os}_$${arch}/; \
 		done; \
+		cd $(ARTIFACTS_PATH); \
+		tar cvzf $(PROJECT)_$(BRANCH)_$${os}_$${arch}.tgz $(PROJECT)_$${os}_$${arch}/; \
 	done; \