diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 93318d5..dff3f56 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -1,6 +1,12 @@
+# 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:           beust-jcommander
 Version:        1.78
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java framework for parsing command line parameters
 License:        ASL 2.0
 URL:            http://jcommander.org/
@@ -16,8 +22,12 @@ Source2:        generate-tarball.sh
 Patch0:         0001-ParseValues-NullPointerException-patch.patch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.testng:testng)
+%endif
 
 %description
 JCommander is a very small Java framework that makes it trivial to
@@ -39,7 +49,7 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
 
 %build
 %mvn_file : %{name}
-%mvn_build -f --xmvn-javadoc
+%mvn_build
 
 %install
 %mvn_install
@@ -51,8 +61,12 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
 %doc license.txt notice.md
 
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.78-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.78-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -73,9 +87,21 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
 - Update to version 1.78.
 - Remove unnecessary parent from POM file.
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.78-2
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.78-1
+- Update to upstream version 1.78
+
+* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.75-1
+- Update to upstream version 1.75
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.71-6
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.71-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -169,4 +195,3 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
 
 * Fri May 13 2011 Jaromir Capik <jcapik@redhat.com> - 1.17-1
 - Initial version of the package
-