diff --git a/Makefile b/Makefile
index 271a440f3..7857f642e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,16 @@ GO_COMPILE=linuxkit/go-compile:7b1f5a37d2a93cd4a9aa2a87db264d8145944006
 ifeq ($(OS),Windows_NT)
 LINUXKIT?=$(CURDIR)/bin/linuxkit.exe
 RTF?=bin/rtf.exe
+GOOS?=windows
 else
 LINUXKIT?=$(CURDIR)/bin/linuxkit
 RTF?=bin/rtf
+GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]')
 endif
-ifneq ($(GOOS),)
+ifneq ($(GOOS),linux)
 CROSS+=-e GOOS=$(GOOS)
 endif
-ifneq ($(GOARCH),)
+ifneq ($(GOARCH),amd64)
 CROSS+=-e GOARCH=$(GOARCH)
 endif