diff --git a/xz-java.spec b/xz-java.spec
index 394939a..9fde643 100644
--- a/xz-java.spec
+++ b/xz-java.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:           xz-java
 Version:        1.8
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java implementation of XZ data compression
 License:        Public Domain
 URL:            http://tukaani.org/xz/java.html
@@ -9,7 +15,11 @@ BuildArch:      noarch
 Source0:        http://tukaani.org/xz/xz-java-%{version}.zip
 
 BuildRequires:  javapackages-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  ant
+%endif
 
 %description
 A complete implementation of XZ data compression in Java.
@@ -28,9 +38,6 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -c %{name}-%{version}
 
-# disable javadoc linting
-sed -i -e '/<javadoc/aadditionalparam="-Xdoclint:none"' build.xml
-
 %mvn_file : %{name} xz
 
 %build
@@ -38,7 +45,7 @@ sed -i -e '/<javadoc/aadditionalparam="-Xdoclint:none"' build.xml
 # package-list from oracle.com. Create a dummy package-list to prevent that.
 mkdir -p extdoc && touch extdoc/package-list
 
-ant maven -Dsourcever=1.8
+%ant maven -Dsourcever=1.6
 
 %install
 %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar
@@ -53,8 +60,12 @@ ant maven -Dsourcever=1.8
 %license COPYING
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.8-11
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-12
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-11
+- Bootstrap build
+- Non-bootstrap build
 
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -71,9 +82,15 @@ ant maven -Dsourcever=1.8
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-4
+- Mass rebuild for javapackages-tools 201902
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-3
+- Mass rebuild for javapackages-tools 201901
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild