diff --git a/dom4j.changes b/dom4j.changes
index aa80a78..278e3df 100644
--- a/dom4j.changes
+++ b/dom4j.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 17 15:40:13 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Add jaxb-api dependency for relevant distribution versions so that
+  we can build with JDKs that do not include the JavaEE modules
+
 -------------------------------------------------------------------
 Fri Apr 17 12:04:59 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/dom4j.spec b/dom4j.spec
index 97d5e9a..7c60601 100644
--- a/dom4j.spec
+++ b/dom4j.spec
@@ -22,7 +22,7 @@ Release:        0
 Summary:        JarJar of dom4j for JBoss
 License:        Apache-1.1
 Group:          Development/Libraries/Java
-URL:            http://www.dom4j.org/
+URL:            https://www.dom4j.org/
 #Source0:        dom4j-1.6.1.tar.gz
 # Debian sources don't need a proprietary msv for build, so that's why I used them
 # svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j
@@ -52,7 +52,6 @@ BuildRequires:  isorelax
 BuildRequires:  java-devel >= 1.6
 # Needed for maven conversions
 BuildRequires:  javapackages-local
-BuildRequires:  glassfish-jaxb-api
 BuildRequires:  javapackages-tools
 BuildRequires:  jaxen-bootstrap >= 1.1
 BuildRequires:  jtidy
@@ -79,8 +78,11 @@ Requires:       xpp3
 #Requires:       jaxp = 1.2
 Requires(post): javapackages-tools
 Requires(postun):javapackages-tools
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+%if 0%{?suse_version} > 1500
+BuildRequires:  glassfish-jaxb-api
+Requires:       glassfish-jaxb-api
+%endif
 
 %description
 dom4j is an easy to use Open Source XML, XPath and XSLT framework for
@@ -123,6 +125,10 @@ DOM, SAX and JAXP and is seamlessly integrated with full XPath support.
 %setup -q -n %{name}
 # replace run.sh
 cp %{SOURCE1} run.sh
+cp %{SOURCE2} pom.xml
+%if 0%{?suse_version} > 1500
+%pom_add_dep javax.xml.bind:jaxb-api pom.xml "<optional>true</optional>"
+%endif
 rm -f src/test/org/dom4j/xpath/MatrixConcatTest.java
 # won't succeed in headless environment
 rm src/test/org/dom4j/bean/BeansTest.java
@@ -169,7 +175,11 @@ popd
 popd
 
 %build
-export CLASSPATH=$(build-classpath jaxen relaxngDatatype xpp3 xpp2 glassfish-jaxb-api)
+export CLASSPATH=$(build-classpath \
+%if 0%{?suse_version} > 1500
+    glassfish-jaxb-api \
+%endif
+    jaxen relaxngDatatype xpp3 xpp2)
 export OPT_JAR_LIST="junit ant/ant-junit"
 rm -rf src/java/org/dom4j/datatype
 ant package release-javadoc
@@ -182,7 +192,7 @@ cp -p build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 mkdir -p %{buildroot}/%{_mavenpomdir}
-install -m 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
+install -m 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap
 
 # javadoc