diff --git a/devel/jdk/17/Makefile b/devel/jdk/17/Makefile
index 3599026cc06..bbbde48ebd1 100644
--- a/devel/jdk/17/Makefile
+++ b/devel/jdk/17/Makefile
@@ -4,8 +4,8 @@ USE_NOBTCFI=	Yes
 DPB_PROPERTIES=	parallel
 
 COMMENT=	OpenJDK Software Development Kit v${VERSION_STR}
-BASE_VER=	17.0.16
-PATCH_VER=	8
+BASE_VER=	17.0.17
+PATCH_VER=	10
 BSD_PORT_REL=	1
 VERSION_STR=	${BASE_VER}+${PATCH_VER}-${BSD_PORT_REL}
 PACKAGE_VER=	${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL}
diff --git a/devel/jdk/17/distinfo b/devel/jdk/17/distinfo
index 0d007916512..4db86c717d3 100644
--- a/devel/jdk/17/distinfo
+++ b/devel/jdk/17/distinfo
@@ -1,8 +1,8 @@
-SHA256 (jdk/jdk-17.0.16+8-1.tar.gz) = A31t22E+vlimveGRkxLM6XinT3zcbl9ZkJM+JNq7wuI=
+SHA256 (jdk/jdk-17.0.17+10-1.tar.gz) = mb0zzozGGFduhpO5rxu0gFnLUBEoYAnUag+r0tjTa6g=
 SHA256 (jdk/openjdk-jdk17u-bootjdk-aarch64-20240331.tar.gz) = 3BSKOAqYlWUeFIwI4AU1jZomGZAnTwDgYbstSN1AolM=
 SHA256 (jdk/openjdk-jdk17u-bootjdk-amd64-20240331.tar.gz) = 7VvWCMsIiGn3E9IBF5U7J4whxy/mpVdUXBeEjAc3riY=
 SHA256 (jdk/openjdk-jdk17u-bootjdk-i386-20240331.tar.gz) = Rik04uuj4ED8T24w86TaF9RSmEHPSujQjEVvX91YLJs=
-SIZE (jdk/jdk-17.0.16+8-1.tar.gz) = 107976153
+SIZE (jdk/jdk-17.0.17+10-1.tar.gz) = 108082578
 SIZE (jdk/openjdk-jdk17u-bootjdk-aarch64-20240331.tar.gz) = 115192316
 SIZE (jdk/openjdk-jdk17u-bootjdk-amd64-20240331.tar.gz) = 114955227
 SIZE (jdk/openjdk-jdk17u-bootjdk-i386-20240331.tar.gz) = 108857519
diff --git a/devel/jdk/17/patches/patch-src_hotspot_cpu_aarch64_jniFastGetField_aarch64_cpp b/devel/jdk/17/patches/patch-src_hotspot_cpu_aarch64_jniFastGetField_aarch64_cpp
new file mode 100644
index 00000000000..2b28cbd6d3b
--- /dev/null
+++ b/devel/jdk/17/patches/patch-src_hotspot_cpu_aarch64_jniFastGetField_aarch64_cpp
@@ -0,0 +1,13 @@
+Add missing header needed for commit Fix crashes on Apple Silicon
+
+Index: src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
+--- src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp.orig
++++ src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
+@@ -31,6 +31,7 @@
+ #include "prims/jniFastGetField.hpp"
+ #include "prims/jvm_misc.hpp"
+ #include "prims/jvmtiExport.hpp"
++#include "runtime/thread.inline.hpp"
+ #include "runtime/safepoint.hpp"
+ #include "runtime/threadWXSetters.inline.hpp"
+ 
diff --git a/devel/jdk/17/patches/patch-src_hotspot_os_bsd_os_bsd_cpp b/devel/jdk/17/patches/patch-src_hotspot_os_bsd_os_bsd_cpp
deleted file mode 100644
index d23ef274966..00000000000
--- a/devel/jdk/17/patches/patch-src_hotspot_os_bsd_os_bsd_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-Use the correct number of cpus when hw.smt=0
-
-Index: src/hotspot/os/bsd/os_bsd.cpp
---- src/hotspot/os/bsd/os_bsd.cpp.orig
-+++ src/hotspot/os/bsd/os_bsd.cpp
-@@ -296,7 +296,11 @@ void os::Bsd::initialize_system_info() {
- 
-   // get processors count via hw.ncpus sysctl
-   mib[0] = CTL_HW;
-+#if defined(HW_NCPUONLINE)
-+  mib[1] = HW_NCPUONLINE;
-+#else
-   mib[1] = HW_NCPU;
-+#endif
-   len = sizeof(cpu_val);
-   if (sysctl(mib, 2, &cpu_val, &len, NULL, 0) != -1 && cpu_val >= 1) {
-     assert(len == sizeof(cpu_val), "unexpected data size");
diff --git a/devel/jdk/17/patches/patch-src_java_desktop_unix_native_libpipewire_include_spa_utils_endian_h b/devel/jdk/17/patches/patch-src_java_desktop_unix_native_libpipewire_include_spa_utils_endian_h
deleted file mode 100644
index 8f9a441c7ed..00000000000
--- a/devel/jdk/17/patches/patch-src_java_desktop_unix_native_libpipewire_include_spa_utils_endian_h
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix BSD support - from jdk21
-
-Index: src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
---- src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h.orig
-+++ src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
-@@ -5,11 +5,20 @@
- #ifndef SPA_ENDIAN_H
- #define SPA_ENDIAN_H
- 
--#if defined(__FreeBSD__) || defined(__MidnightBSD__)
-+#if defined(_BSDONLY_SOURCE)
- #include <sys/endian.h>
- #define bswap_16 bswap16
- #define bswap_32 bswap32
- #define bswap_64 bswap64
-+#ifndef __BYTE_ORDER
-+#define __BYTE_ORDER _BYTE_ORDER
-+#endif
-+#ifndef __BIG_ENDIAN
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+#endif
-+#ifndef __LITTLE_ENDIAN
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#endif
- #elif defined(_MSC_VER) && defined(_WIN32)
- #include <stdlib.h>
- #define __LITTLE_ENDIAN 1234