diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index 4669b80..353dc1b 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -1,22 +1,26 @@
-%global base_name       beanutils
-%global short_name      commons-%{base_name}
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
 
-Name:           apache-%{short_name}
+%bcond_without bootstrap
+
+Name:           apache-commons-beanutils
 Version:        1.9.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
 License:        ASL 2.0
-URL:            http://commons.apache.org/%{base_name}
+URL:            http://commons.apache.org/beanutils
 BuildArch:      noarch
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(commons-collections:commons-collections)
-BuildRequires:  mvn(commons-collections:commons-collections-testframework)
 BuildRequires:  mvn(commons-logging:commons-logging)
-BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+%endif
 
 %description
 The scope of this package is to create a package of Java utility methods
@@ -31,7 +35,7 @@ Summary:        Javadoc for %{name}
 %{summary}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n commons-beanutils-%{version}-src
 sed -i 's/\r//' *.txt
 
 %pom_remove_plugin :maven-assembly-plugin
@@ -39,10 +43,11 @@ sed -i 's/\r//' *.txt
 %mvn_alias :{*} :@1-core :@1-bean-collections
 %mvn_alias :{*} org.apache.commons:@1 org.apache.commons:@1-core org.apache.commons:@1-bean-collections
 %mvn_file : %{name} %{name}-core %{name}-bean-collections
-%mvn_file : %{short_name} %{short_name}-core %{short_name}-bean-collections
+%mvn_file : commons-beanutils commons-beanutils-core commons-beanutils-bean-collections
 
 %build
-%mvn_build
+# Some tests fail in Koji
+%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.beanutils
 
 %install
 %mvn_install
@@ -55,8 +60,12 @@ sed -i 's/\r//' *.txt
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.9.4-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.4-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.4-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -70,13 +79,22 @@ sed -i 's/\r//' *.txt
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.4-2
+- Mass rebuild for javapackages-tools 201902
+
 * Fri Oct 04 2019 Fabio Valentini <decathorpe@gmail.com> - 1.9.4-1
 - Update to version 1.9.4.
 - Re-enable test suite.
 
+* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.9.4-1
+- Update to upstream version 1.9.4
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.3-5
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild