diff --git a/java-comment-preprocessor.changes b/java-comment-preprocessor.changes
index e964207..49bec0a 100644
--- a/java-comment-preprocessor.changes
+++ b/java-comment-preprocessor.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 22 12:20:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
 -------------------------------------------------------------------
 Thu Aug 27 14:58:02 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-comment-preprocessor.spec b/java-comment-preprocessor.spec
index 6c965c9..086857a 100644
--- a/java-comment-preprocessor.spec
+++ b/java-comment-preprocessor.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package java-comment-preprocessor
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,17 +23,19 @@ Summary:        The Most Powerful Multi-Pass Java Preprocessor
 License:        Apache-2.0
 URL:            https://github.com/raydac/java-comment-preprocessor
 Source0:        https://github.com/raydac/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
-BuildRequires:  maven-local fdupes
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  maven-local
 BuildRequires:  mvn(commons-codec:commons-codec)
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.shared:file-management)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.codehaus.mojo:exec-maven-plugin)
 BuildArch:      noarch
 
@@ -61,7 +63,11 @@ This package contains the API Documentation for %{name}.
 find -name "*.jar" -or -name "*.class" | xargs rm -f
 
 %build
-%{mvn_build} -f -- -P'!metacheck' -Dsource=8
+%{mvn_build} -f -- -P'!metacheck' \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-Dmaven.compiler.release=8 \
+%endif
+    -Dsource=8
 
 %install
 %mvn_install