diff --git a/.travis.yml b/.travis.yml
index 2fc4236..afee684 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ install:
 - glide install
 
 script:
-- gox -output "build/{{.Dir}}_{{.OS}}_{{.Arch}}"
+- make cross-build
 - goverage -v -coverprofile=coverage.out ./...
 - godacov -t $CODACY_TOKEN -r ./coverage.out -c $TRAVIS_COMMIT
 
diff --git a/Makefile b/Makefile
index 61341e7..dc842f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 BINARY = "build/wings"
+OSARCHLIST = "darwin/386 darwin/amd64 linux/386 linux/amd64 linux/arm linux/arm64 windows/386 windows/amd64"
 
 all: $(BINARY)
 
@@ -6,7 +7,7 @@ $(BINARY):
 	go build -o $(BINARY)
 
 cross-build:
-	gox -output "build/{{.Dir}}_{{.OS}}_{{.Arch}}"
+	gox -osarch $(OSARCHLIST) -output "build/{{.Dir}}_{{.OS}}_{{.Arch}}"
 
 .PHONY: install
 install: