diff --git a/.gitignore b/.gitignore
index 29d5e56..114cc94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,11 @@
 /*.src.rpm
 
 /r1.0.0.tar.gz
+/r1.1.0.tar.gz
+/r1.1.1.tar.gz
 /apiguardian-api-1.0.0.pom
 /apiguardian-1.1.0.tar.gz
 /apiguardian-api-1.1.0.pom
 /apiguardian-1.1.1.tar.gz
+/apiguardian-api-1.1.0.pom
 /apiguardian-api-1.1.1.pom
diff --git a/apiguardian.spec b/apiguardian.spec
index ea6d0af..b7f24ec 100644
--- a/apiguardian.spec
+++ b/apiguardian.spec
@@ -1,16 +1,25 @@
+# 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:           apiguardian
-Summary:        API Guardian Java annotation
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
+Summary:        API Guardian Java annotation
 License:        ASL 2.0
-
 URL:            https://github.com/apiguardian-team/apiguardian
-Source0:        %{url}/archive/r%{version}/%{name}-%{version}.tar.gz
-Source100:      https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/%{version}/apiguardian-api-%{version}.pom
-
 BuildArch:      noarch
 
+Source0:        https://github.com/apiguardian-team/apiguardian/archive/r%{version}.tar.gz
+
+Source100:      https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/%{version}/apiguardian-api-%{version}.pom
+
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%endif
 
 %description
 API Guardian indicates the status of an API element and therefore its
@@ -19,19 +28,16 @@ methods, constructors, and fields within a framework or application in
 order to publish their API status and level of stability and to
 indicate how they are intended to be used by consumers of the API.
 
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 
 %description    javadoc
 API documentation for %{name}.
 
-
 %prep
-%setup -q -n %{name}-r%{version}
-find -name "*.jar" -print -delete
-
-cp -pav %{SOURCE100} pom.xml
+%setup -q -n apiguardian-r%{version}
+find -name \*.jar -delete
+cp -p %{SOURCE100} pom.xml
 
 # Inject OSGi manifest required by Eclipse
 %pom_xpath_inject pom:project "
@@ -63,25 +69,25 @@ cp -pav %{SOURCE100} pom.xml
     </pluginManagement>
   </build>"
 
-
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE
 
-
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-2
+- Bootstrap build
+- Non-bootstrap build
 
 * Mon Feb 01 2021 Fabio Valentini <decathorpe@gmail.com> - 1.1.1-1
 - Update to version 1.1.1.
@@ -89,6 +95,9 @@ cp -pav %{SOURCE100} pom.xml
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Thu Jan 14 2021 Marian Koncek <mkoncek@redhat.com> - 1.1.1-1
+- Update to upstream version 1.1.1
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -98,12 +107,21 @@ cp -pav %{SOURCE100} pom.xml
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-2
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Wed Jul 17 2019 Marian Koncek <mkoncek@redhat.com> - 1.1.0-1
+- Update to upstream version 1.1.0
+
 * Thu Jun 27 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.0-1
 - Update to version 1.1.0.
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0-5
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -115,4 +133,3 @@ cp -pav %{SOURCE100} pom.xml
 
 * Thu Sep 14 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0-1
 - Initial packaging
-
diff --git a/sources b/sources
index 131c8d7..d448938 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (apiguardian-1.1.1.tar.gz) = 117bc68a516e5c340ea2b6e2cc931ad999878986ad9c520bb00b6f565b812dad9ef2317129241c607db8b11c9ac638406d22d177a793171a012bd385adb98947
+SHA512 (r1.1.1.tar.gz) = 117bc68a516e5c340ea2b6e2cc931ad999878986ad9c520bb00b6f565b812dad9ef2317129241c607db8b11c9ac638406d22d177a793171a012bd385adb98947
 SHA512 (apiguardian-api-1.1.1.pom) = 25cc83493162bb98a9efb94c11757b008ba7d0eb6e12eb30f3c1a904ad506dd0ec0890e3c66fa7dc1fe8fb6f182084da3d014a999b946a72a66e148b89a6e261