diff --git a/maven-source-plugin.spec b/maven-source-plugin.spec
index 65a1f6a..a366057 100644
--- a/maven-source-plugin.spec
+++ b/maven-source-plugin.spec
@@ -1,63 +1,68 @@
+# 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:           maven-source-plugin
-Summary:        Plugin creating source JAR
 Version:        3.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
+Summary:        Plugin creating source JAR
 License:        ASL 2.0
-
 URL:            http://maven.apache.org/plugins/maven-source-plugin/
-Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-
 BuildArch:      noarch
 
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.maven:maven-archiver) >= 3.5.0
+BuildRequires:  mvn(org.apache.maven:maven-archiver)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
 BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver) >= 4.2.0
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+%endif
 
 %description
 The Maven Source Plugin creates a JAR archive of the
 source files of the current project.
 
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 
 %description    javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q
 
-
 %build
 %mvn_file : %{name}
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
 
-
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.1-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-6
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-5
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -74,6 +79,15 @@ API documentation for %{name}.
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Jan 21 2020 Marian Koncek <mkoncek@redhat.com> - 3.2.1-1
+- Update to upstream version 3.2.1
+
+* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
+- Update to upstream version 3.2.0
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-2
+- Mass rebuild for javapackages-tools 201902
+
 * Sun Nov 03 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
 - Update to version 3.2.0.
 
@@ -83,6 +97,12 @@ API documentation for %{name}.
 * Sat Jun 29 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
 - Update to version 3.1.0.
 
+* Fri May 31 2019 Marian Koncek <mkoncek@redhat.com> - 3.1.0-1
+- Update to upstrem version 3.1.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-5
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -176,4 +196,3 @@ API documentation for %{name}.
 
 * Thu May 27 2010 Alexander Kurtakov <akurtako@redhat.com> 2.1.2-1
 - Initial package.
-