diff --git a/plexus-resources.spec b/plexus-resources.spec
index 8c04a74..bea40db 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -1,19 +1,27 @@
+# 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:           plexus-resources
-Summary:        Plexus Resource Manager
 Version:        1.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
+Summary:        Plexus Resource Manager
 License:        MIT
-
-URL:            https://github.com/codehaus-plexus/%{name}
-Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
-
+URL:            https://github.com/codehaus-plexus/plexus-resources
 BuildArch:      noarch
 
+Source0:        https://github.com/codehaus-plexus/plexus-resources/archive/plexus-resources-%{version}.tar.gz
+
 BuildRequires:  maven-local
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.codehaus.plexus:plexus-components:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+%endif
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -23,23 +31,19 @@ reusable components for hibernate, form processing, jndi, i18n,
 velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 
 %description    javadoc
 API documentation for %{name}.
 
-
 %prep
-%setup -q -n %{name}-%{name}-%{version}
-
+%setup -q -n plexus-resources-plexus-resources-%{version}
 
 %build
 %mvn_file  : plexus/resources
 %mvn_build -f
 
-
 %install
 %mvn_install
 
@@ -47,10 +51,13 @@ API documentation for %{name}.
 
 %files javadoc -f .mfiles-javadoc
 
-
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -64,12 +71,21 @@ API documentation for %{name}.
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
 - 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
+
 * Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.0-1
 - Update to version 1.1.0.
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.26.a7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 31 2019 Marian Koncek <mkoncek@redhat.com> - 1.1.0-1
+- Update to upstream version 1.1.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-0.24.a7
+- Mass rebuild for javapackages-tools 201901
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.25.a7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -185,4 +201,3 @@ API documentation for %{name}.
 
 * Mon Jun 12 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.0-0.a4.1jpp
 - Initial build
-