diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index f4d702f..f387867 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -1,8 +1,12 @@
-%bcond_with bootstrap
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_withouht bootstrap
 
 Name:           apache-commons-cli
 Version:        1.4
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Command Line Interface Library for Java
 License:        ASL 2.0
 URL:            http://commons.apache.org/cli/
@@ -46,6 +50,9 @@ command line arguments and options.
 %doc README.md RELEASE-NOTES.txt
 
 %changelog
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-15
+- Rebuild to workaround DistroBaker issue
+
 * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-14
 - Bootstrap Maven for CentOS Stream 9