diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index d02c0f7..9f68f67 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -25,7 +25,7 @@
 # Define GOROOT macros
 %global goroot          /usr/lib/%{name}
 %global gopath          %{_datadir}/gocode
-%global golang_arches   x86_64 aarch64 ppc64le s390x
+%global golang_arches   x86_64 aarch64 ppc64le s390x %{ix86} %{arm}
 
 # Golang build options.
 
@@ -64,6 +64,14 @@
 %global shared 0
 %endif
 
+%ifarch %{ix86}
+%global gohostarch  386
+%endif
+
+%ifarch %{arm}
+%global gohostarch  arm
+%endif
+
 %ifarch x86_64
 %global gohostarch  amd64
 %endif
@@ -467,6 +475,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 23 2018 Johnny Hughes <johnny@centos.org> - 1.9.4-1
+- Modify to build on i386 and armhfp
+
 * Thu Feb 08 2018 Jakub Čajka <jcajka@redhat.com> - 1.9.4-1
 - Rebase to 1.9.4
 - Fix CVE-2018-6574