diff --git a/Makefile b/Makefile
index 02e3b20..9669417 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL=/bin/bash
 BUILD = go build
-MAKDIR = mkdir -p binaries
+MKDIR = mkdir -p bin
 
 .PHONY: build build_win build_tag clean
 
@@ -13,13 +13,13 @@ all:
 build_linux:
 	@$(MKDIR)
 	@echo "Bulding binaries for GNU/Linux ..."
-	@$(BUILD) -o ./binaries/ -v ./cmd/...
+	@$(BUILD) -o ./bin/ -v ./cmd/...
 
 # Build the binaries for windows (cross build) and place them under binaries/ directory.
 build_win:
 	@$(MKDIR)
 	@echo "Bulding binaries for windows (cross build) ..."
-	@env GOOS=windows $(BUILD)  -o ./binaries/ -v ./cmd/...
+	@env GOARCH=amd64 GOOS=windows $(BUILD)  -o ./bin/ -v ./cmd/...
 
 # Build the binaries for both GNU/linux and Windows and place them under binaries/ directory.
 build: build_linux build_win
@@ -39,6 +39,6 @@ endif
 
 # Remove binaries directory
 clean:
-	@rm -rf binaries/
+	@rm -rf bin/
 
 
diff --git a/README.md b/README.md
index ec23906..1497e5f 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@
 - Clone the repository `git clone https://github.com/csaf-poc/csaf_distribution.git `
 
 - Build Go components
-  Makefile supplies the following builds:
-	- Build For Linux System:`make build_linux`
+  Makefile supplies the following targets:
+	- Build For GNU/Linux System: `make build_linux`
 	- Build For Windows System (cross build): `make build_win`
     - Build For both linux and windows: `make build`
 	- Build from the last github-tag: `make build_tag`
 
-These places the binaries under `binaries/` directory.
+These places the binaries under `bin/` directory.
 
 - [Install](http://nginx.org/en/docs/install.html)  **nginx**
 - To configure nginx see [docs/provider-setup.md](docs/provider-setup.md)