diff --git a/tycho.changes b/tycho.changes
index 020939c..8fb4b20 100644
--- a/tycho.changes
+++ b/tycho.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 11 19:51:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Try harder to assure that all classes in tycho are understood
+  by Java 8 (bsc#1198279)
+
 -------------------------------------------------------------------
 Tue Mar 29 13:55:50 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tycho.spec b/tycho.spec
index bd20221..87d1d34 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -341,14 +341,16 @@ sed -i '
 %{mvn_file} :{*} tycho/@1
 
 %build
+%{mvn_build} -f \
 %if %{with bootstrap}
-%global no_javadoc "-j"
-%else
-%global no_javadoc %{nil}
+    -j \
 %endif
-%{mvn_build} %{no_javadoc} -f -- \
-  -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
-  -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap -Dsource=8
+    -- -Dtycho-version=%{version}-SNAPSHOT -DtychoBootstrapVersion=%{version}-SNAPSHOT \
+    -Dmaven.repo.local=$(pwd)/.m2 -Dfedora.p2.repos=$(pwd)/bootstrap \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+    -Dmaven.compiler.release=8 \
+%endif
+    -Dsource=8
 
 %{mvn_artifact} fedoraproject-p2/org.fedoraproject.p2/pom.xml