diff --git a/opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch b/opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
index 992cb1b..b0fd9f9 100644
--- a/opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
+++ b/opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
@@ -13,7 +13,7 @@ index a7f6209..84f4c59 100644
  	</target>
  	<target name="compile" description="Compiles the Fabric Manager GUI application">
 -	    <javac  srcdir="${src}" destdir="${target}/classes"
-+	    <javac target="1.7" srcdir="${src}" destdir="${target}/classes"
++	    <javac target="1.8" srcdir="${src}" destdir="${target}/classes"
  			        encoding="windows-1252"
  				    debug="true"
  		    		fork="yes"
diff --git a/opa-fmgui.changes b/opa-fmgui.changes
index 4265c94..ff75d8d 100644
--- a/opa-fmgui.changes
+++ b/opa-fmgui.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct 31 22:45:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
+    + Build with java source/target levels 8
+    + Fixes building with JDK21
+
 -------------------------------------------------------------------
 Mon Apr 11 13:00:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/opa-fmgui.spec b/opa-fmgui.spec
index cc50b4e..27d5a1a 100644
--- a/opa-fmgui.spec
+++ b/opa-fmgui.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package opa-fmgui
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2015 Intel Corporation
 #
 # All modifications and additions to the file contributed by third parties
@@ -75,12 +75,12 @@ Patch2:         manifest-version.patch
 Patch3:         opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
 BuildRequires:  ant
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  java-devel >= 1.7
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  openssl
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  wget
-Requires:       jre >= 1.7
+Requires:       jre >= 1.8
 Requires:       mlocate
 # BuildRequires:  gradle
 BuildArch:      noarch