diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE
index bd347a4c5..e313e4555 100644
--- a/Makefile.INCLUDE
+++ b/Makefile.INCLUDE
@@ -38,7 +38,7 @@ endif
 # Never honor GOBIN, should it be set at all.
 unexport GOBIN
 
-GOARCH		  = $(subst x86_64,amd64,$(ARCH))
+GOARCH		  = $(subst x86_64,amd64,$(patsubst i%86,386,$(ARCH)))
 GOPKG		 ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
 GOURL		 ?= https://golang.org/dl
 GOROOT		  = $(BUILD_PATH)/root/go