diff --git a/.gitignore b/.gitignore
index 5fd2b3d..6806087 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,8 @@
 /commons-parent-42.tar.xz
 /commons-parent-43-src.zip
 /commons-parent-47.tar.gz
+/commons-parent-48.tar.gz
+/commons-parent-49.tar.gz
+/commons-parent-50.tar.gz
+/commons-parent-51.tar.gz
 /commons-parent-52.tar.gz
diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec
index aa9e117..683629f 100644
--- a/apache-commons-parent.spec
+++ b/apache-commons-parent.spec
@@ -1,39 +1,45 @@
-%global srcname commons-parent
+# 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:           apache-commons-parent
 Version:        52
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apache Commons Parent Pom
 License:        ASL 2.0
+URL:            https://commons.apache.org/commons-parent-pom.html
 BuildArch:      noarch
 
-%global upstream_version rel/%{srcname}-%{version}
-%global upstream_archive %{srcname}-rel-%{srcname}-%{version}
-
-URL:            https://commons.apache.org/commons-parent-pom.html
-Source0:        https://github.com/apache/%{srcname}/archive/%{upstream_version}/%{srcname}-%{version}.tar.gz
+Source0:        https://github.com/apache/commons-parent/archive/rel/commons-parent-%{version}.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  mvn(org.apache:apache:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache:apache:pom:)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+%endif
 
 # Not generated automatically
+%if %{without bootstrap}
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+%endif
 Requires:       mvn(org.codehaus.mojo:build-helper-maven-plugin)
 
 %description
 The Project Object Model files for the apache-commons packages.
 
-
 %prep
-%setup -q -n %{upstream_archive}
+%setup -q -n commons-parent-rel-commons-parent-%{version}
 
 # Plugin is not in fedora
-%pom_remove_plugin :commons-build-plugin
-%pom_remove_plugin :maven-scm-publish-plugin
+%pom_remove_plugin org.apache.commons:commons-build-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-scm-publish-plugin
 
 # Plugins useless in package builds
 %pom_remove_plugin :apache-rat-plugin
@@ -47,23 +53,23 @@ for profile in animal-sniffer japicmp jacoco cobertura clirr; do
     %pom_xpath_remove "pom:profile[pom:id='$profile']"
 done
 
-
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %doc README.md RELEASE-NOTES.txt
 %license LICENSE.txt NOTICE.txt
 
-
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 52-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 52-4
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 52-3
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 52-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -71,18 +77,39 @@ done
 * Tue Sep 01 2020 Fabio Valentini <decathorpe@gmail.com> - 52-1
 - Update to version 52.
 
+* Fri Aug 21 2020 Marian Koncek <mkoncek@redhat.com> - 52-1
+- Update to upstream version 52
+
+* Tue Jul 28 2020 Marian Koncek <mkoncek@redhat.com> - 51-1
+- Update to upstream version 51
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 47-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 47-5
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
+* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 50-1
+- Update to upstream version 50
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 47-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 49-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 49-1
+- Update to upstream version 49
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 47-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 48-2
+- Mass rebuild for javapackages-tools 201901
+
+* Fri May 03 2019 Marian Koncek <mkoncek@redhat.com> - 48-1
+- Update to upstream version 48
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 47-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -205,4 +232,3 @@ done
 
 * Wed Oct 20 2010 Chris Spike <spike@fedoraproject.org> 15-1
 - Initial version of the package
-