diff --git a/jaxb.spec b/jaxb.spec
index 7e7fcf1..d229496 100644
--- a/jaxb.spec
+++ b/jaxb.spec
@@ -3,7 +3,7 @@
 
 Name:           jaxb
 Version:        2.3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        JAXB Reference Implementation
 # EDL-1.0 license is BSD-3-clause
 License:        BSD
@@ -25,9 +25,11 @@ BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 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)
+BuildRequires:  mvn(com.sun.xml.fastinfoset:FastInfoset)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+BuildRequires:  mvn(org.jvnet.staxex:stax-ex)
 BuildRequires:  mvn(xml-resolver:xml-resolver)
 BuildRequires:  mvn(xmlunit:xmlunit)
 %endif
@@ -228,15 +230,13 @@ sed -i -e 's/com\.sun\.org\.apache\.xml\.internal\.resolver/org.apache.xml.resol
 %pom_disable_module codemodel
 # Don't run tests for minimal build
 %pom_remove_plugin -r :maven-failsafe-plugin
-%endif
-
-# These packages not yet proper JPMS modules in Fedora
-# TODO: remove this when staxex, fastinfoset are updated
+# Remove optional extra marshaller implementations for minimal build
 %pom_remove_dep org.jvnet.staxex:stax-ex runtime/impl bundles/runtime
 %pom_remove_dep com.sun.xml.fastinfoset:FastInfoset runtime/impl bundles/runtime
 rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfoset,StAXEx}Connector.java
 rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,StAXEx}StreamWriterOutput.java
 sed -i -e '/org.jvnet.staxex/d' -e '/com.sun.xml.fastinfoset/d' runtime/impl/src/main/java/module-info.java bundles/runtime/src/main/java/module-info.java
+%endif
 
 # Fastinfoset and Staxex are optional deps, reflect that in OSGi metadata
 sed -i -e '/<Import-Package>/aorg.jvnet.staxex;resolution:=optional,org.jvnet.fastinfoset.stax;resolution:=optional,com.sun.xml.fastinfoset.stax;resolution:=optional,' bundles/runtime/pom.xml
@@ -316,6 +316,9 @@ popd
 %endif
 
 %changelog
+* Tue Aug 18 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-4
+- Restore deps on fi and stax-ex for full build mode
+
 * Mon Aug 17 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-3
 - Add obsoletes/provides and compat aliases for old xsom package