diff --git a/8332854-Unable-to-build-openjdk-with-with-harfbuzz=system.patch b/8332854-Unable-to-build-openjdk-with-with-harfbuzz=system.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ba23bf8b777ca64c09272dc14507fb49ddb054e9
--- /dev/null
+++ b/8332854-Unable-to-build-openjdk-with-with-harfbuzz=system.patch
@@ -0,0 +1,22 @@
+From ba5a4670b8ad86fefb41a939752754bf36aac9dc Mon Sep 17 00:00:00 2001
+From: Phil Race <prr@openjdk.org>
+Date: Mon, 17 Jun 2024 19:37:32 +0000
+Subject: [PATCH] 8332854: Unable to build openjdk with --with-harfbuzz=system
+
+Reviewed-by: jwaters, erikj, jdv, ihse
+---
+ make/modules/java.desktop/lib/ClientLibraries.gmk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
+index 6f3616608ccea..f023969536987 100644
+--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
++++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
+@@ -281,6 +281,7 @@ endif
+ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
+    LIBFONTMANAGER_EXTRA_SRC =
+    LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
++   LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
+ else
+    LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
+ 
diff --git a/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz b/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz
deleted file mode 100644
index f3c8511e1bf935df3e8ed099d5a245961d2312c7..0000000000000000000000000000000000000000
Binary files a/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz and /dev/null differ
diff --git a/openjdk-latest.spec b/openjdk-latest.spec
index f3aaa5fbaf0d8d94b64ec1a75cf3a48ac5bf6bea..29a37113913fd3cdbcb2c5ff6850969e13baaa62 100644
--- a/openjdk-latest.spec
+++ b/openjdk-latest.spec
@@ -898,7 +898,7 @@ Name:    java-latest-%{origin}
 Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
-Release: 0
+Release: 1
 
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
@@ -936,7 +936,6 @@ URL:      http://openjdk.java.net/
 Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz
 Source1: OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz
 Source2: OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz
-Source3: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -981,6 +980,9 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_a
 Patch7: downgrade-the-glibc-symver-of-memcpy.patch
 Patch8: downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
 
+# 23.0.1
+Patch9: 8332854-Unable-to-build-openjdk-with-with-harfbuzz=system.patch
+
 ############################################
 #
 # LoongArch64 specific patches
@@ -1217,6 +1219,7 @@ pushd %{top_level_dir_name}
 %patch3 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 popd # openjdk
 
 %patch1000
@@ -1338,8 +1341,7 @@ elif [ "$ARCH" = "aarch64" ]; then
     tar -xf %{SOURCE1}
     BOOTJDKPATH=$PWD/jdk-23.0.1+11
 elif [ "$ARCH" = "riscv64" ]; then
-    tar -xf %{SOURCE3}
-    BOOTJDKPATH=$PWD/jdk-21.0.3+9
+    :
 elif [ "$ARCH" = "loongarch64" ]; then
     :
 elif [ "$ARCH" = "ppc64le" ]; then
@@ -1800,6 +1802,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
 
 
 %changelog
+* Thu Nov 22 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:23.0.1.11-1
+- Modify bootjdk for riscv64
+- Backport JDK-8332854
+
 * Tue Nov 19 2024 neu-mobi <liuyulong35@huawei.com> - 1:23.0.1.11-0
 - update to jdk23.0.1+11
 - remove some redundant patches & fix changelog