diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index c46c552..c4afdd7 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -1835,6 +1835,12 @@ if [ $prioritylength -ne 8 ] ; then
  exit 14
 fi
 
+%ifarch riscv64
+# Update config.{guess,sub} with RISC-V (riscv64) support
+cp /usr/lib/rpm/redhat/config.guess openjdk/make/autoconf/build-aux/
+cp /usr/lib/rpm/redhat/config.sub   openjdk/make/autoconf/build-aux/
+%endif
+
 # OpenJDK patches
 
 %if %{system_libs}