diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec
index 970e920..00acdab 100644
--- a/go-rpm-macros.spec
+++ b/go-rpm-macros.spec
@@ -8,6 +8,9 @@ Version:   3.0.9
 
 # Master definition that will be written to macro files
 %global golang_arches   %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
+%if 0%{?rhel} >= 9
+%global golang_arches   x86_64 aarch64 ppc64le s390x
+%endif
 %global gccgo_arches    %{mips}
 # Go sources can contain arch-specific files and our macros will package the
 # correct files for each architecture. Therefore, move gopath to _libdir and
@@ -17,7 +20,7 @@ Version:   3.0.9
 ExclusiveArch: %{golang_arches} %{gccgo_arches}
 
 Name:      go-rpm-macros
-Release:   1%{?dist}
+Release:   1.1%{?dist}
 Summary:   Build-stage rpm automation for Go packages
 
 License:   GPLv3+
@@ -162,6 +165,10 @@ install -m 0644 -vp   rpm/macros.d/macros.go-compilers-gcc \
 %{_spectemplatedir}/*.spec
 
 %changelog
+* Tue Dec 01 2020 Petr Šabata <contyk@redhat.com> - 3.0.9-1.1
+- Drop 32bit arches in EL 9
+- Downstream only until uprstream PR#3 gets merged
+
 * Thu Aug 13 2020 Neal Gompa <ngompa13@gmail.com> - 3.0.9-1
 - Update to 3.0.9