diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index f4a5c18..980e00b 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.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:           apache-commons-cli
 Version:        1.4
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Command Line Interface Library for Java
 License:        ASL 2.0
 URL:            http://commons.apache.org/cli/
@@ -11,10 +17,14 @@ Source0:        http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers
 # workaround for https://issues.apache.org/jira/browse/CLI-253
 Patch0:         CLI-253-workaround.patch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+%endif
 
 %description
 The CLI library provides a simple and easy to use API for working with the
@@ -29,12 +39,6 @@ command line arguments and options.
 %mvn_alias : org.apache.commons:commons-cli
 %mvn_file : commons-cli %{name}
 
-# Fix javadoc generation on java 11
-%pom_xpath_inject pom:pluginManagement/pom:plugins "<plugin>
-<artifactId>maven-javadoc-plugin</artifactId>
-<configuration><source>1.6</source></configuration>
-</plugin>" 
-
 %build
 %mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
 
@@ -46,8 +50,12 @@ command line arguments and options.
 %doc README.md RELEASE-NOTES.txt
 
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-13
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-14
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-13
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -64,9 +72,18 @@ command line arguments and options.
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-7
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-6
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-5
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild