diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec
index 1203f08..8994b67 100644
--- a/httpcomponents-project.spec
+++ b/httpcomponents-project.spec
@@ -1,19 +1,26 @@
-%global srcname httpcomponents-parent
+# 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:           httpcomponents-project
 Summary:        Common POM file for HttpComponents
 Version:        12
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0
-
-URL:            http://hc.apache.org/
-Source0:        http://archive.apache.org/dist/httpcomponents/%{srcname}/%{srcname}-%{version}-source-release.zip
-
+URL:            https://hc.apache.org/
+Source0:        https://archive.apache.org/dist/httpcomponents/httpcomponents-parent/httpcomponents-parent-%{version}-source-release.zip
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:      noarch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache:apache:pom:)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+%endif
 
 %description
 Common Maven POM file for HttpComponents. This project should be
@@ -21,7 +28,9 @@ required only for building dependant packages with Maven. Please don't
 use it as runtime requirement.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n httpcomponents-parent-%{version}
+
+cp -p %{SOURCE1} .
 
 %pom_remove_plugin :clirr-maven-plugin
 %pom_remove_plugin :docbkx-maven-plugin
@@ -43,8 +52,12 @@ use it as runtime requirement.
 %license LICENSE.txt NOTICE.txt
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 12-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 12-4
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 12-3
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -52,6 +65,9 @@ use it as runtime requirement.
 * Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 12-1
 - Update to version 12.
 
+* Fri Sep 18 2020 Marian Koncek <mkoncek@redhat.com> - 12-1
+- Update to upstream version 12
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -61,12 +77,21 @@ use it as runtime requirement.
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 11-2
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Wed May 29 2019 Fabio Valentini <decathorpe@gmail.com> - 11-1
 - Update to version 11.
 
+* Wed May 29 2019 Marian Koncek <mkoncek@redhat.com> - 11-1
+- Update to upstream version 11
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 9-3
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 1a4c004..1b3acd6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (httpcomponents-parent-12-source-release.zip) = ba0cc569643439387b1a4912e7199ecaefbf836239bb389d8f0f13d93a078728100e570271eb87b17f1de2d79f295883ff2ad91953578b89b2ea45f158f2d5b1
+SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8