diff --git a/jaxb.spec b/jaxb.spec
index 740ce92..a983c73 100644
--- a/jaxb.spec
+++ b/jaxb.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 Name:           jaxb
 Version:        4.0.1
@@ -20,7 +20,6 @@ BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 %if %{without bootstrap}
-BuildRequires:  mvn(com.sun.activation:jakarta.activation)
 BuildRequires:  mvn(com.sun.istack:istack-commons-runtime)
 BuildRequires:  mvn(com.sun.istack:istack-commons-tools)
 BuildRequires:  mvn(com.sun.xml.dtd-parser:dtd-parser)
@@ -38,15 +37,14 @@ GlassFish JAXB Reference Implementation.
 Summary:        Codemodel Core
 
 %description codemodel
-The core functionality of the CodeModel java source code generation
-library.
+The core functionality of the CodeModel java source code generation library.
 
 %package codemodel-annotation-compiler
 Summary:        Codemodel Annotation Compiler
 
 %description codemodel-annotation-compiler
-The annotation compiler ant task for the CodeModel java source code
-generation library.
+The annotation compiler ant task for the CodeModel java source code generation
+library.
 
 %package relaxng-datatype
 Summary:        RelaxNG Datatype
@@ -64,6 +62,12 @@ expected to be useful for applications that need to take XML Schema as an
 input.
 
 %if %{without bootstrap}
+%package core
+Summary:        JAXB Core
+
+%description core
+JAXB Core module. Contains sources required by XJC, JXC and Runtime modules.
+
 %package rngom
 Summary:        RELAX NG Object Model/Parser
 
@@ -86,16 +90,15 @@ TXW is a library that allows you to write XML documents.
 Summary:        JAXB XJC
 
 %description xjc
-JAXB Binding Compiler. Contains source code needed for binding
-customization files into java sources. In other words: the tool to
-generate java classes for the given xml representation.
+JAXB Binding Compiler. Contains source code needed for binding customization
+files into java sources. In other words: the tool to generate java classes for
+the given xml representation.
 
 %package txwc2
 Summary:        TXW2 Compiler
 
 %description txwc2
-JAXB schema generator. The tool to generate XML schema based on java
-classes.
+JAXB schema generator. The tool to generate XML schema based on java classes.
 %endif
 
 %prep
@@ -128,11 +131,7 @@ pushd jaxb-ri
 # Missing dependency on org.checkerframework:compiler
 %pom_disable_module jxc
 
-# Fix dep on xml resolver
-%pom_change_dep com.sun.org.apache.xml.internal:resolver xml-resolver:xml-resolver:1.2 xjc
-sed -i -e 's/com\.sun\.org\.apache\.xml\.internal\.resolver/org.apache.xml.resolver/' xjc/src/main/java/com/sun/tools/xjc/CatalogUtil.java
-
-%pom_remove_dep -r com.sun.org.apache.xml.internal:resolver
+%pom_remove_dep org.eclipse.angus:angus-activation core
 %endif
 
 # Compatibility
@@ -174,6 +173,8 @@ popd
 %files xsom -f jaxb-ri/.mfiles-xsom
 %license LICENSE.md NOTICE.md
 %if %{without bootstrap}
+%files core -f jaxb-ri/.mfiles-jaxb-core
+%license LICENSE.md NOTICE.md
 %files rngom -f jaxb-ri/.mfiles-rngom
 %license LICENSE.md NOTICE.md
 %files runtime -f jaxb-ri/.mfiles-jaxb-runtime