diff --git a/jcsp.changes b/jcsp.changes
index 1ce04c6..a3d1847 100644
--- a/jcsp.changes
+++ b/jcsp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 24 12:41:08 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Specify maven.compiler.release to fix build with jdk9+ and newer
+  maven-javadoc-plugin
+
 -------------------------------------------------------------------
 Tue Nov 12 17:45:45 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jcsp.spec b/jcsp.spec
index df261a4..2b452fc 100644
--- a/jcsp.spec
+++ b/jcsp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jcsp
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,8 @@ URL:            https://github.com/codehaus/jcsp
 # sh jcsp-create-tarball.sh < VERSION-TAG >
 Source0:        %{name}-%{namedversion}-clean.tar.xz
 Source1:        %{name}-create-tarball.sh
-BuildRequires:  maven-local fdupes
+BuildRequires:  fdupes
+BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildArch:      noarch
@@ -119,7 +120,10 @@ rm -r src/org/jcsp/win32 \
 
 %build
 
-%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8
+%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-Dmaven.compiler.release=6
+%endif
 
 %install
 %mvn_install