diff --git a/jakarta-annotations.spec b/jakarta-annotations.spec
index d0f694b..9fbcffd 100644
--- a/jakarta-annotations.spec
+++ b/jakarta-annotations.spec
@@ -1,23 +1,27 @@
-%global srcname common-annotations-api
+# 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:           jakarta-annotations
 Version:        1.3.5
-Release:        8%{?dist}
+Release:        10%{?dist}
 Summary:        Jakarta Annotations
 License:        EPL-2.0 or GPLv2 with exceptions
-
 URL:            https://github.com/eclipse-ee4j/common-annotations-api
-Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-
 BuildArch:      noarch
 
+Source0:        https://github.com/eclipse-ee4j/common-annotations-api/archive/%{version}/common-annotations-api-%{version}.tar.gz
+
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:  mvn(org.glassfish.build:spec-version-maven-plugin)
+%endif
 
-# renamed in fedora 33, remove in fedora 35
-Obsoletes:      glassfish-annotation-api < 1.3.5-1
 Provides:       glassfish-annotation-api = %{version}-%{release}
 
 %description
@@ -25,12 +29,10 @@ Jakarta Annotations defines a collection of annotations representing
 common semantic concepts that enable a declarative style of programming
 that applies across a variety of Java technologies.
 
-
-%javadoc_package
-
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n common-annotations-api-%{version}
 
 # remove unnecessary dependency on parent POM
 # org.eclipse.ee4j:project is not packaged and isn't needed
@@ -44,6 +46,7 @@ that applies across a variety of Java technologies.
 %pom_remove_plugin :maven-javadoc-plugin api
 %pom_remove_plugin :maven-source-plugin api
 %pom_remove_plugin :findbugs-maven-plugin api
+%pom_remove_plugin :spec-version-maven-plugin api
 
 # provide aliases for the old artifact coordinates
 %mvn_alias jakarta.annotation:jakarta.annotation-api \
@@ -53,19 +56,23 @@ that applies across a variety of Java technologies.
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE.md NOTICE.md
 %doc README.md
 
-
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.5-8
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.5-10
+- Bootstrap Maven for CentOS Stream 9
+
+* Wed May 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.5-9
+- Re-add provides on glassfish-annotation-api
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.5-8
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild