diff --git a/Makefile b/Makefile
index 0f23e23..facacc1 100644
--- a/Makefile
+++ b/Makefile
@@ -71,8 +71,11 @@ build_linux build_win:
 DISTDIR := csaf_distribution-$(SEMVER)
 dist: build_linux build_win
 	mkdir -p dist
-	mkdir dist/$(DISTDIR)-windows-amd64
-	cp -r README.md docs bin-windows-amd64 dist/$(DISTDIR)-windows-amd64
+	mkdir -p dist/$(DISTDIR)-windows-amd64/bin-windows-amd64
+	cp README.md dist/$(DISTDIR)-windows-amd64
+	cp bin-windows-amd64/csaf_uploader.exe bin-windows-amd64/csaf_checker.exe dist/$(DISTDIR)-windows-amd64/bin-windows-amd64/
+	mkdir -p dist/$(DISTDIR)-windows-amd64/docs
+	#cp docs/csaf_uploader.md docs/csaf_checker.md dist/$(DISTDIR)-windows-amd64/docs
 	mkdir dist/$(DISTDIR)-gnulinux-amd64
 	cp -r README.md docs bin-linux-amd64 dist/$(DISTDIR)-gnulinux-amd64
 	cd dist/ ; zip -r $(DISTDIR)-windows-amd64.zip $(DISTDIR)-windows-amd64/