diff --git a/beust-jcommander-build.xml b/beust-jcommander-build.xml
index e387619..585d592 100644
--- a/beust-jcommander-build.xml
+++ b/beust-jcommander-build.xml
@@ -49,14 +49,30 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           target="${compiler.target}" 
+           release="${compiler.release}" 
            verbose="false" 
-           fork="false" 
-           source="${compiler.source}">
+           fork="false">
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
     </javac>
+    <javac destdir="${build.outputDir}" 
+           encoding="${project.build.sourceEncoding}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           release="9" 
+           verbose="false" 
+           fork="false">
+      <modulepath>
+        <pathelement location="${build.outputDir}"/>
+      </modulepath>
+      <src>
+        <pathelement location="."/>
+      </src>
+	  <include name="**/module-info.java"/>
+    </javac>
   </target>
 
   <!-- ====================================================================== -->
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 40d73e5..47ff216 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -16,6 +16,7 @@
 #
 
 
+%define __requires_exclude java-headless
 %global short_name jcommander
 Name:           beust-%{short_name}
 Version:        1.83
@@ -31,7 +32,7 @@ Source2:        %{name}-build.xml
 Patch0:         0001-ParseValues-NullPointerException-patch.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
+BuildRequires:  java-devel >= 9
 BuildRequires:  javapackages-local >= 6
 Requires:       java >= 1.8
 Obsoletes:      %{short_name} < %{version}-%{release}