diff --git a/byteman.spec b/byteman.spec
index 2e4bca5..903e750 100644
--- a/byteman.spec
+++ b/byteman.spec
@@ -15,7 +15,7 @@
 
 Name:             byteman
 Version:          4.0.16
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Java agent-based bytecode injection tool
 License:          LGPLv2+
 URL:              http://www.jboss.org/byteman
@@ -23,6 +23,7 @@ URL:              http://www.jboss.org/byteman
 Source0:          https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz
 
 BuildArch:        noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly.
 BuildRequires:    java-11-openjdk-devel
@@ -215,6 +216,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
 %{homedir}/lib/byteman-dtest.jar
 
 %changelog
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 4.0.16-5
+- Rebuilt for Drop i686 JDKs
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.0.16-4
 - Rebuilt for java-17-openjdk as system jdk