diff --git a/.gitignore b/.gitignore
index 351a275..83581f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libfonts-1.1.3-jars-itextpatch-deleted.zip
+/libfonts-1.1.3-jars-itextpatch_deleted-encodings_updated.zip
diff --git a/libfonts-1.1.2.java11.patch b/libfonts-1.1.2.java11.patch
index 5aae626..77d20f3 100644
--- a/libfonts-1.1.2.java11.patch
+++ b/libfonts-1.1.2.java11.patch
@@ -6,8 +6,8 @@
              description="Indicates whether source should be compiled with deprecation information" />
 -  <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
 -  <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
-+  <property name="javac.source" value="1.6" description="Provide source compatibility with specified release" />
-+  <property name="javac.target" value="1.6" description="Generate class files for specific VM version" />
++  <property name="javac.source" value="1.8" description="Provide source compatibility with specified release" />
++  <property name="javac.target" value="1.8" description="Generate class files for specific VM version" />
  
    <!-- Build Cache properties -->
    <property name="build.cache.dir"
diff --git a/libfonts.spec b/libfonts.spec
index b309b23..b8aed0e 100644
--- a/libfonts.spec
+++ b/libfonts.spec
@@ -1,12 +1,17 @@
 Name: libfonts
 Version: 1.1.3
-Release: 35%{?dist}
+Release: 36%{?dist}
 Summary: TrueType Font Layouting
-License: LGPLv2 and UCD
+License: LGPL-2.1-only AND Unicode-DFS-2016
 #Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip
+#unzip
+#a) to simplify the licensing
 #unzip, find . -name "*.jar" -exec rm {} \;, rm -r patches
-#to simplify the licensing
-Source: %{name}-%{version}-jars-itextpatch-deleted.zip
+#b) to update data files to clearer license
+#cd encodings
+#wget -e robots=off --no-host-directories --recursive --no-parent --reject "index.html*" --cut-dirs=2 https://unicode.org/Public/MAPPINGS/
+#rm -rf OBSOLETE
+Source: %{name}-%{version}-jars-itextpatch_deleted-encodings_updated.zip
 URL: http://reporting.pentaho.org/
 BuildRequires: ant, java-devel, jpackage-utils, libloader >= 1.1.3
 Requires: java-headless, jpackage-utils, libloader >= 1.1.3
@@ -61,6 +66,12 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 01 2026 RHEL Packaging Agent <redhat-ymir-agent@redhat.com> - 1.1.3-36
+- Bump javac source/target from 1.6 to 1.8 for Java 17 compatibility
+- Migrate License to SPDX format (LGPL-2.1-only AND Unicode-DFS-2016)
+- Use repacked source tarball with updated unicode encoding data files
+- Resolves: RHEL-183541
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-35
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index cd0df2a..3e93cc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libfonts-1.1.3-jars-itextpatch-deleted.zip) = 0233b5843ef109de08c86d613d769ed8e8ba4afb8a660336ccdf983720641f5aaf39c29cfa522249a6d0a268f6b65a57f51cb93ab4c9043e0785fb46946917fe
+SHA512 (libfonts-1.1.3-jars-itextpatch_deleted-encodings_updated.zip) = 35d389f859dd912db9820e90c1b6d815fd44fc4c32d560e3971178ba36dc323b67b4f5fa74cbe179e2c99b613f5feddd433c8f32b392bcccddf06c4c23364362