diff --git a/CentOS-9/SPECS/libreoffice.spec b/CentOS-9/SPECS/libreoffice.spec
index 3cb2ddd..59f6dfd 100644
--- a/CentOS-9/SPECS/libreoffice.spec
+++ b/CentOS-9/SPECS/libreoffice.spec
@@ -7,7 +7,12 @@
 # Should contain any suffix of release tarball name, e.g., -buildfix1.
 %global libo_buildfix %{nil}
 # rhbz#715152 state vendor
-%global vendoroption --with-vendor="Strepsirrhini"
+%if 0%{?rhel}
+%global vendoroption --with-vendor="Red Hat, Inc."
+%endif
+%if 0%{?fedora}
+%global vendoroption --with-vendor="The Fedora Project"
+%endif
 %global libo_python python3
 %global libo_python_executable %{__python3}
 %global libo_python_sitearch %{python3_sitearch}
@@ -46,11 +51,14 @@
 
 %global bundling_options %{nil}
 
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        1%{?libo_prerelease}%{?dist}
 # default new files are: MPLv2
 # older files are typically: MPLv2 incorporating work under ASLv2
 # nlpsolver is: LGPLv3
@@ -265,6 +273,8 @@ Patch5: 0001-aarch64-failing-here.patch
 Patch6: 0001-include-filename-if-the-test-fails.patch
 # backported
 Patch7: 0001-fix-testSignDocument_PEM_PDF.patch
+Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
+Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch
 
@@ -319,7 +329,7 @@ Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts
 Requires: %{name}-langpack-en = %{epoch}:%{version}-%{release}
 %ifarch %{java_arches}
 # rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
-Requires: java-headless >= 1:1.6
+Recommends: java-headless >= 1:1.6
 %else
 Obsoletes: libreoffice-nlpsolver < 1:7.4.0.0
 Obsoletes: libreoffice-officebean < 1:7.4.0.0
@@ -352,6 +362,9 @@ Summary: Database front-end for LibreOffice
 %if 0%{?fedora}
 Requires: firebird
 %endif
+%ifarch %{java_arches}
+Requires: java-headless >= 1:1.6
+%endif
 Requires: pentaho-reporting-flow-engine
 Requires: postgresql-jdbc
 Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
@@ -1014,9 +1027,6 @@ sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk # aarch64
 sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # ppc64le
 sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # ppc64le
 sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk # s390x
-# TODO: Investigate this later
-# CppunitTest_ucb_webdav_core fails on Fedora 39
-sed -i -e s/CppunitTest_ucb_webdav_core// ucb/Module_ucb.mk # Fedora 39
 
 #see rhbz#2072615
 git rm vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
@@ -2248,8 +2258,17 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
-* Wed Aug 02 2023 Sandino Araico Sánchez <sandino@sandino.net> -  1:7.5.5.2-2
-- Unit test failing on Fedora 39
+* Mon Jul 31 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-1
+- 7.5.5.2
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5.4.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 1:7.5.4.2-4
+- Rebuilt for ICU 73.2
+
+* Fri Jun 30 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1:7.5.4.2-3
+- Make Java optional. Fixes rhbz#2084071.
 
 * Mon Jun 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:7.5.4.2-2
 - Backport upstream fix for testSignDocument_PEM_PDF test failure