diff --git a/mojo-parent.spec b/mojo-parent.spec
index 41bd844..03d141b 100644
--- a/mojo-parent.spec
+++ b/mojo-parent.spec
@@ -1,23 +1,30 @@
+# 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:           mojo-parent
 Version:        60
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Codehaus MOJO parent project pom file
 License:        ASL 2.0
-
 URL:            https://www.mojohaus.org/mojo-parent/
-Source0:        https://github.com/mojohaus/mojo-parent/archive/%{name}-%{version}.tar.gz
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-
 BuildArch:      noarch
 
+Source0:        https://github.com/mojohaus/mojo-parent/archive/%{name}-%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%endif
 
 %description
 Codehaus MOJO parent project pom file
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-
 # Not needed in Fedora.
 %pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :maven-site-plugin
@@ -25,23 +32,23 @@ Codehaus MOJO parent project pom file
 
 cp %SOURCE1 .
 
-
 %build
 %mvn_alias : org.codehaus.mojo:mojo
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %doc LICENSE-2.0.txt
 
-
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 60-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 60-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 60-2
+- Bootstrap build
+- Non-bootstrap build
 
 * Mon Feb 01 2021 Fabio Valentini <decathorpe@gmail.com> - 60-1
 - Update to version 60.
@@ -49,6 +56,12 @@ cp %SOURCE1 .
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 50-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 60-1
+- Update to upstream version 60
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 50-1
+- Update to upstream version 50
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 50-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -61,9 +74,15 @@ cp %SOURCE1 .
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 40-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 40-8
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 40-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 40-7
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 40-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -191,4 +210,3 @@ cp %SOURCE1 .
 
 * Mon Sep  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 24-1
 - Initial version of the package
-