diff --git a/openregex.changes b/openregex.changes
index 332204b..1c24382 100644
--- a/openregex.changes
+++ b/openregex.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 11 17:52:15 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Do not build against the legacy version of guava any more
+- Build with Java 8 as baseline, in order to be able to use
+  guava 30.1.1
+
 -------------------------------------------------------------------
 Fri Feb 28 06:40:21 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/openregex.spec b/openregex.spec
index 3cb5188..6c8398f 100644
--- a/openregex.spec
+++ b/openregex.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openregex
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,9 +24,10 @@ License:        LGPL-3.0-only
 URL:            https://github.com/knowitall/%{name}
 Source0:        https://github.com/knowitall/%{name}/archive/v%{version}.tar.gz
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(com.google.guava:guava:15.0)
+BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildArch:      noarch
 
@@ -47,7 +48,11 @@ This package contains javadoc for %{name}.
 %pom_remove_plugin :scala-maven-plugin
 
 %build
-%{mvn_build} -f -- -Dsource=6
+%{mvn_build} -f -- \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-Dmaven.compiler.release=8 \
+%endif
+	-Dsource=8
 
 %install
 %mvn_install