diff --git a/lfs/Config b/lfs/Config
index a278b0155..26d463112 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -117,8 +117,18 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 # Go
+export GOARCH
+export GOOS   = linux
 export GOPATH = $(HOME)/gopath
 
+ifeq "$(BUILD_ARCH)" "x86_64"
+	GOARCH = amd64
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+	GOARCH = arm64
+endif
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################