diff --git a/xbean.spec b/xbean.spec
index e25a652..e8f3bbc 100644
--- a/xbean.spec
+++ b/xbean.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:           xbean
 Version:        4.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java plugin based web server
 License:        ASL 2.0
 URL:            https://geronimo.apache.org/xbean/
@@ -73,6 +77,9 @@ find -name Log4jConverter.java -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-4
+- Rebuild to workaround DistroBaker issue
+
 * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
 - Bootstrap Maven for CentOS Stream 9