diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE
index bd347a4c51..02c6f476b4 100644
--- a/Makefile.INCLUDE
+++ b/Makefile.INCLUDE
@@ -27,7 +27,7 @@ MAC_OS_X_VERSION ?= 10.8
 BUILD_PATH = $(PWD)/.build
 
 GO_VERSION	 := 1.4
-GOOS		  = $(subst Darwin,darwin,$(subst Linux,linux,$(OS)))
+GOOS		  = $(subst Darwin,darwin,$(subst Linux,linux,$(subst FreeBSD,freebsd,$(OS))))
 
 ifeq ($(GOOS),darwin)
 RELEASE_SUFFIX ?= -osx$(MAC_OS_X_VERSION)
@@ -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