diff --git a/fence-agents.spec b/fence-agents.spec
index 5238ab0..b435b77 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -9,7 +9,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.9.0
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Release: 4%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@@ -668,7 +668,6 @@ Requires: python-requests
 %endif
 Requires: fence-agents-common = %{version}-%{release}
 Requires: ha-openstack-support = %{version}-%{release}
-BuildArch: noarch
 %description compute
 Fence agent for Nova compute nodes.
 %files compute
@@ -987,7 +986,6 @@ Requires: python-requests
 %endif
 Requires: fence-agents-common = %{version}-%{release}
 Requires: ha-openstack-support = %{version}-%{release}
-BuildArch: noarch
 %description openstack
 Fence agent for OpenStack's Nova service.
 %files openstack
@@ -1156,7 +1154,6 @@ via telnet or SSH.
 License: GPLv2+ and LGPLv2+
 Summary: Fence agent for IBM z/VM over IP
 Requires: fence-agents-common = %{version}-%{release}
-BuildArch: noarch
 %description zvm
 Fence agent for IBM z/VM over IP.
 %files zvm
@@ -1245,19 +1242,20 @@ are located on corosync cluster nodes.
 %{_libdir}/fence-virt/cpg.so
 
 %changelog
+* Wed Jul  7 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-4
+- Remove "BuildArch: noarch" for arch-specific subpackages
+  Resolves: rhbz#1857247
+
 * Thu Jul  1 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-3
 - OpenStack agents: add dependency
-
   Resolves: rhbz#1857247
 
 * Fri Jun  4 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-1
 - Rebase and add fence-virt subpackages
-
   Resolves: rhbz#1965988
 
 * Tue May 18 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.1-10
 - remove pexpect dependency
-
   Resolves: rhbz#1961551
 
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.7.1-9