diff --git a/.travis.yml b/.travis.yml
index 18120461..9e53ba17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,7 @@ go:
 addons:
   artifacts:
     paths:
-    - maputnik_linux
-    - maputnik_darwin
-    - maputnik_windows.exe
+    - bin
 install:
 - go get -u golang.org/x/sys/...
 - go get github.com/fsnotify/fsnotify
@@ -23,6 +21,6 @@ install:
 - wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json
 script:
 - make
-- ./maputnik --help
-- ./maputnik --version
-- ./maputnik --watch --file style.json & sleep 5; kill $!
+- ./bin/linux/maputnik --help
+- ./bin/linux/maputnik --version
+- ./bin/linux/maputnik --watch --file style.json & sleep 5; kill $!
diff --git a/Makefile b/Makefile
index 4548565d..f5ea7b43 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ EDITOR_VERSION ?= v1.5.0
 all: $(BINARY)
 
 $(BINARY): $(SOURCES) bindata_assetfs.go
-	gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "${BINARY}_{{.OS}}"
+	gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}"
 
 editor/create_folder:
 	mkdir -p editor
@@ -19,4 +19,4 @@ bindata_assetfs.go: editor/pull_release
 
 .PHONY: clean
 clean:
-	rm -rf editor/public && rm -f bindata.go && rm -f bindata_assetfs.go && rm -f maputnik_*
+	rm -rf editor/public && rm -f bindata.go && rm -f bindata_assetfs.go && rm -f bin