diff --git a/jakarta.xml.bind-api.jar b/jakarta.xml.bind-api.jar
new file mode 100644
index 0000000..c123f65
Binary files /dev/null and b/jakarta.xml.bind-api.jar differ
diff --git a/pki-core.spec b/pki-core.spec
index bf90329..d0841a3 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -177,7 +177,6 @@ BuildRequires:    apache-commons-io
 BuildRequires:    apache-commons-lang3 >= 3.2
 BuildRequires:    apache-commons-logging
 BuildRequires:    apache-commons-net
-BuildRequires:    glassfish-jaxb-api
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 BuildRequires:    nspr-devel
@@ -412,7 +411,6 @@ Requires:         apache-commons-io
 Requires:         apache-commons-lang3 >= 3.2
 Requires:         apache-commons-logging
 Requires:         apache-commons-net
-Requires:         glassfish-jaxb-api
 Requires:         slf4j
 Requires:         slf4j-jdk14
 Requires:         jpackage-utils >= 0:1.7.5-10
@@ -429,10 +427,6 @@ Requires:         resteasy-core >= 3.0.17-1
 Requires:         resteasy-jackson2-provider >= 3.0.17-1
 %endif
 
-%if 0%{?fedora} >= 33 || 0%{?rhel} > 8
-Requires:         jaxb-impl >= 2.3.3
-%endif
-
 Requires:         xalan-j2
 Requires:         xerces-j2
 Requires:         xml-commons-resolver
@@ -947,6 +941,10 @@ ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroo
 # with server
 %endif
 
+# TEMP provide links to the temporarily bundled JAXB JAR (#2002594)
+ln -sf /usr/share/java/jaxb-api.jar /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar
+ln -sf /usr/share/java/glassfish-jaxb-api/jakarta.xml.bind-api.jar %{buildroot}/jakarta.xml.bind-api.jar
+
 %if %{with server}
 
 %pre -n pki-server
@@ -1375,6 +1373,13 @@ fi
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
 
+* Thu Sep 09 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 10.11.0-0.2.alpha1
+- Drop BuildRequires and Requires on glassfish-jaxb-api and jaxb-impl
+  Resolves #2002594
+
+* Tue May 18 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.0-0.1
+- Rebase to PKI 10.11.0-alpha1
+
 * Thu Jul  1 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.0-0.3
 - Drop sudo dependency