diff --git a/libreoffice-fresh/riscv64-support.patch b/libreoffice-fresh/riscv64-support.patch
index c081639c6..b80dc87fe 100644
--- a/libreoffice-fresh/riscv64-support.patch
+++ b/libreoffice-fresh/riscv64-support.patch
@@ -1,8 +1,8 @@
-diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
-index e2de3c167..7b73c68a7 100644
---- a/bridges/Library_cpp_uno.mk
-+++ b/bridges/Library_cpp_uno.mk
-@@ -114,6 +114,15 @@ bridge_noopt_objects := cpp2uno uno2cpp
+Index: libreoffice-24.8.3.2/bridges/Library_cpp_uno.mk
+===================================================================
+--- libreoffice-24.8.3.2.orig/bridges/Library_cpp_uno.mk
++++ libreoffice-24.8.3.2/bridges/Library_cpp_uno.mk
+@@ -134,6 +134,15 @@ bridge_noopt_objects := abi cpp2uno uno2
  bridge_exception_objects := except
  endif
  
@@ -18,23 +18,10 @@ index e2de3c167..7b73c68a7 100644
  else ifeq ($(CPUNAME),POWERPC)
  
  ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
-diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
-index 0233ce24d..7196be74d 100644
---- a/external/firebird/UnpackedTarball_firebird.mk
-+++ b/external/firebird/UnpackedTarball_firebird.mk
-@@ -48,6 +48,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-     external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \
-     external/firebird/configure-c99.patch \
-     external/firebird/Wincompatible-function-pointer-types.patch \
-+    external/firebird/firebird-riscv64-support.patch.1 \
- ))
- 
- ifeq ($(OS),WNT)
-diff --git a/external/firebird/firebird-riscv64-support.patch.1 b/external/firebird/firebird-riscv64-support.patch.1
-new file mode 100644
-index 000000000..c42ebbc15
+Index: libreoffice-24.8.3.2/external/firebird/firebird-riscv64-support.patch.1
+===================================================================
 --- /dev/null
-+++ b/external/firebird/firebird-riscv64-support.patch.1
++++ libreoffice-24.8.3.2/external/firebird/firebird-riscv64-support.patch.1
 @@ -0,0 +1,168 @@
 +diff --git a/builds/posix/prefix.linux_riscv64 b/builds/posix/prefix.linux_riscv64
 +new file mode 100644
@@ -204,3 +191,15 @@ index 000000000..c42ebbc15
 + 
 + 	isc_info_db_impl_last_value   // Leave this LAST!
 + };
+Index: libreoffice-24.8.3.2/external/firebird/UnpackedTarball_firebird.mk
+===================================================================
+--- libreoffice-24.8.3.2.orig/external/firebird/UnpackedTarball_firebird.mk
++++ libreoffice-24.8.3.2/external/firebird/UnpackedTarball_firebird.mk
+@@ -53,6 +53,7 @@ $(eval $(call gb_UnpackedTarball_add_pat
+     external/firebird/Wincompatible-function-pointer-types.patch \
+     external/firebird/c++26.patch \
+     external/firebird/c++20.patch \
++    external/firebird/firebird-riscv64-support.patch.1 \
+ ))
+ 
+ ifeq ($(OS),WNT)
diff --git a/libreoffice-fresh/riscv64.patch b/libreoffice-fresh/riscv64.patch
index 4dfc9f213..2c6e02cb8 100644
--- a/libreoffice-fresh/riscv64.patch
+++ b/libreoffice-fresh/riscv64.patch
@@ -1,40 +1,18 @@
 --- PKGBUILD
 +++ PKGBUILD
-@@ -65,7 +65,8 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-     623ea5c.diff
-     libreoffice-7.5.8.2-icu-74-compatibility.patch
-     soffice-template.desktop.in 
--    libreoffice-fresh.sh libreoffice-fresh.csh)
-+    libreoffice-fresh.sh libreoffice-fresh.csh
-+    "riscv64-support.patch")
- noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-            798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-            a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-@@ -119,7 +120,8 @@ sha256sums=('c205a65042f65c94b54ea310344b851043633c3eb5259f4e567d9341aae5e45e'
-             'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
-             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
-             '9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f'
--            '512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb')
-+            '512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb'
-+            '3f05bb4d781d331c5cfa2600866be7e10c6b23406ce890c3db741a2db76e79e2')
+@@ -137,6 +137,8 @@ prepare() {
+     export CXXFLAGS="$ARCH_FLAGS"
  
- prepare() {
- 
-@@ -142,6 +144,8 @@ prepare() {
-     # fix build with icu 74
-     patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch
+     patch -p1 -i ../poppler-24.10.patch # Fix build with Poppler 24.10 (KaoS patch)
++
++    patch -p1 -i ../riscv64-support.patch
+ }
  
-+    patch -Np1 -i "${srcdir}"/riscv64-support.patch
+ build() {
+@@ -424,3 +426,6 @@ package_libreoffice-fresh() {
+     'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
+         > "${pkgdir}"/usr/lib/libreoffice/help/languages.js
+ }
 +
-     #use the CFLAGS but remove the LibO overridden ones
-     for i in $CFLAGS; do
-         case "$i" in
-@@ -198,7 +202,7 @@ build() {
-         --enable-gtk3 \
-         --enable-gtk4 \
-         --enable-introspection \
--        --enable-lto \
-+        --disable-lto \
-         --enable-openssl \
-         --enable-odk\
-         --enable-python=system \
++source+=(riscv64-support.patch)
++sha256sums+=('c5615aa1437a2a3ac7fbba749dc7ee0c0b3406346d501e500837ed1f68878c23')