diff --git a/plexus-components-pom.spec b/plexus-components-pom.spec
index 3eca406..8cd1b20 100644
--- a/plexus-components-pom.spec
+++ b/plexus-components-pom.spec
@@ -1,18 +1,27 @@
-Name:           plexus-components-pom
-Summary:        Plexus Components POM
-Version:        6.5
-Release:        3%{?dist}
-License:        ASL 2.0
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
 
+%bcond_without bootstrap
+
+Name:           plexus-components-pom
+Version:        6.5
+Release:        4%{?dist}
+Summary:        Plexus Components POM
+License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-components
+BuildArch:      noarch
+
 Source0:        https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/%{version}/plexus-components-%{version}.pom
 Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 
-BuildArch:      noarch
-
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+%endif
 
 %description
 This package provides Plexus Components parent POM used by different
@@ -33,18 +42,31 @@ cp -p %{SOURCE1} LICENSE
 %doc LICENSE
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.5-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.5-4
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.5-3
+- Bootstrap build
+- Non-bootstrap build
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Fri Dec 11 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.5-1
+- Update to upstream version 6.5
+
 * Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 6.5-1
 - Update to version 6.5.
 
+* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 6.4-1
+- Update to upstream version 6.4
+
 * Sun Aug 16 2020 Fabio Valentini <decathorpe@gmail.com> - 6.4-1
 - Update to version 6.4.
 
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 6.3-1
+- Update to upstream version 6.3
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -60,12 +82,21 @@ cp -p %{SOURCE1} LICENSE
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0-2
+- Mass rebuild for javapackages-tools 201902
+
 * Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 4.0-1
 - Update to version 4.0.
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Thu May 30 2019 Marian Koncek <mkoncek@redhat.com> - 4.0-1
+- Update to upstream version 4.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.1-11
+- Mass rebuild for javapackages-tools 201901
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild