diff --git a/glassfish-jaxb-api-build.xml b/glassfish-jaxb-api-build.xml
index c6147cf..56b23ec 100644
--- a/glassfish-jaxb-api-build.xml
+++ b/glassfish-jaxb-api-build.xml
@@ -10,7 +10,8 @@
   <property name="project.artifactId" value="jaxb-api"/>
   <property name="project.version" value="2.4.0"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -52,6 +53,7 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
+           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
@@ -65,14 +67,16 @@
     <!-- Build Multi-Release classes for Java 9 -->
     <mkdir dir="${build.outputDir.Java9}"/>
     <javac destdir="${build.outputDir.Java9}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="${compiler.target}" 
-           verbose="false" 
-           fork="false" 
-           source="${compiler.source}">
+           nowarn="false"
+           debug="true"
+           encoding="utf-8"
+           optimize="false"
+           deprecation="true"
+           release="9"
+           target="9"
+           verbose="false"
+           fork="false"
+           source="9">
       <src>
         <pathelement location="${build.srcDir.Java9}"/>
       </src>
@@ -82,12 +86,13 @@
       </classpath>
     </javac>
     <!-- Build the module-info.jar file -->
-    <javac destdir="${build.outputDir}"
+    <javac destdir="${build.outputDir.Java9}"
            nowarn="false"
            debug="true"
            encoding="utf-8"
            optimize="false"
            deprecation="true"
+           release="9"
            target="9"
            verbose="false"
            fork="false"
diff --git a/glassfish-jaxb-api.changes b/glassfish-jaxb-api.changes
index 9236db7..ef98f65 100644
--- a/glassfish-jaxb-api.changes
+++ b/glassfish-jaxb-api.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 29 15:33:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- The binaries are compatible with java 1.8
+
 -------------------------------------------------------------------
 Wed Feb 21 22:02:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec
index cb0a5ad..5a49a9f 100644
--- a/glassfish-jaxb-api.spec
+++ b/glassfish-jaxb-api.spec
@@ -18,6 +18,9 @@
 
 %global oname jaxb-spec
 %global bundle jaxb-api
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
 Name:           glassfish-jaxb-api
 Version:        2.4.0
 Release:        0
@@ -33,6 +36,7 @@ BuildRequires:  glassfish-activation-api
 BuildRequires:  java-devel >= 9
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  unzip
+Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description