diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index e45250d..6f40886 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.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-beanutils
 Version:        1.9.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
 License:        ASL 2.0
 URL:            http://commons.apache.org/beanutils
@@ -56,6 +60,9 @@ sed -i 's/\r//' *.txt
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.4-8
+- Rebuild to workaround DistroBaker issue
+
 * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.4-7
 - Bootstrap Maven for CentOS Stream 9