diff --git a/Makefile b/Makefile
index 9cde5cd..ed013f9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,18 @@ all:
 	@echo '   make clean       - Remove all builds'
 
 build:
-	mkdir -p dist/{linux,windows,darwin}
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o dist/linux/addlicense
-	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o dist/darwin/addlicense
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o dist/windows/addlicense.exe
+	mkdir -p dist/{linux,windows,darwin}/{amd64,arm64}
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o dist/linux/amd64/addlicense
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o dist/darwin/arm64/addlicense
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o dist/darwin/amd64/addlicense
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o dist/windows/amd64/addlicense.exe
 	@echo "See 'addlicense' in dist directory"
 
 archive:
-	zip dist/linux/addlicense_$(VERSION)_linux_amd64.zip -j dist/linux/addlicense
-	zip dist/darwin/addlicense_$(VERSION)_darwin_arm64.zip -j dist/darwin/addlicense
-	zip dist/windows/addlicense_$(VERSION)_windows_amd64.zip -j dist/windows/addlicense.exe
+	zip dist/linux/amd64/addlicense_$(VERSION)_linux_amd64.zip -j dist/linux/amd64/addlicense
+	zip dist/darwin/arm64/addlicense_$(VERSION)_darwin_arm64.zip -j dist/darwin/arm64/addlicense
+	zip dist/darwin/amd64/addlicense_$(VERSION)_darwin_amd64.zip -j dist/darwin/amd64/addlicense
+	zip dist/windows/amd64/addlicense_$(VERSION)_windows_amd64.zip -j dist/windows/amd64/addlicense.exe
 
 clean:
 	rm -rf dist