diff --git a/xstream.spec b/xstream.spec
index a67827e..f2a7d07 100644
--- a/xstream.spec
+++ b/xstream.spec
@@ -1,10 +1,13 @@
 %bcond_without activation
 %bcond_without cglib
+%if 0%{?rhel}
+%bcond_with dom4j
+%else
 %bcond_without dom4j
+%endif
 %bcond_without jdom
 %bcond_without jdom2
 %bcond_with jettison
-%bcond_with joda-time
 %bcond_with kxml2
 %bcond_with stax
 %bcond_with woodstox
@@ -13,7 +16,7 @@
 
 Name:           xstream
 Version:        1.4.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java XML serialization library
 License:        BSD
 URL:            https://x-stream.github.io
@@ -54,10 +57,6 @@ BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(org.codehaus.jettison:jettison)
 %endif
 
-%if %{with joda-time}
-BuildRequires:  mvn(joda-time:joda-time)
-%endif
-
 %if %{with kxml2}
 BuildRequires:  mvn(net.sf.kxml:kxml2-min)
 %endif
@@ -118,6 +117,11 @@ find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete
 
 %pom_remove_plugin -r :maven-dependency-plugin
 
+%if 0%{?rhel}
+%pom_remove_plugin :maven-javadoc-plugin xstream
+%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark
+%endif
+
 %if %{without activation}
 %pom_remove_dep -r jakarta.activation:jakarta.activation-api
 rm xstream/src/java/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.java
@@ -160,10 +164,9 @@ rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.jav
 rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonStaxWriter.java
 %endif
 
-%if %{without joda-time}
+# Joda Time for optional ISO8601 date/time converters in JDK 1.7 or below removed.
 %pom_remove_dep -r joda-time:joda-time
 rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java
-%endif
 
 %if %{without kxml2}
 %pom_remove_dep -r net.sf.kxml:kxml2-min
@@ -226,6 +229,11 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/
 %doc README.txt
 
 %changelog
+* Tue Oct 05 2021 Stefan Bluhm <stefan.bluhm@clacee.eu> - 1.4.18-3
+- Disabled dom4j for RHEL.
+- Minimum supported version: Java 1.8
+- Removed joda-time dependency.
+
 * Mon Oct 04 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.18-2
 - Enable activation, cglib, dom4j, jdom, and jdom2