diff --git a/buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXUtils.java b/buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXUtils.java
index f94db5b53..e094aa8d5 100644
--- a/buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXUtils.java
+++ b/buildSrc/src/main/java/org/jackhuang/hmcl/gradle/javafx/JavaFXUtils.java
@@ -66,7 +66,7 @@ public final class JavaFXUtils {
             arch = Platform.is64Bit() ? "arm64" : "arm32";
         else if (Platform.isLoongArch() && Platform.is64Bit())
             arch = "loongarch64";
-        else if ("riscv64".equals(System.getProperty("os.arch"))) // TODO: https://github.com/java-native-access/jna/pull/1671
+        else if (Platform.isRISCV())
             arch = "riscv64";
         else
             return;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 50a2bcbe3..6e2239984 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ nanohttpd = "2.3.1"
 jsoup = "1.19.1"
 chardet = "2.5.0"
 twelvemonkeys = "3.12.0"
-jna = "5.17.0"
+jna = "5.18.0"
 pci-ids = "0.4.0"
 java-info = "1.0"
 authlib-injector = "1.2.5"