diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index ad6f7d553ba4..8bcb5baf4afc 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,21 +1,21 @@
 # Run update.sh to update to the latest nightly
 PORTVERSION=	1.89.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
 DISTNAME=	rustc-nightly-src
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	upstream does not provide bootstraps for other architectures
 
 CONFLICTS_INSTALL=	rust
 
 MASTERDIR=	${.CURDIR}/../rust
 PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-NIGHTLY_DATE=		2025-05-12
-BOOTSTRAPS_DATE=	2025-04-02
+NIGHTLY_DATE=		2025-05-26
+BOOTSTRAPS_DATE=	2025-05-12
 RUST_BOOTSTRAP_VERSION=	beta
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 85dd9fa03e11..f4592890e273 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1747135686
-SHA256 (rust/2025-05-12/rustc-nightly-src.tar.xz) = b5707eca97561a1f59e19d0d0d1d2ee9d930e5bccdb00ce569067825ef3e1746
-SIZE (rust/2025-05-12/rustc-nightly-src.tar.xz) = 283351272
-SHA256 (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c8d0147c625faa5ce0e75c2509827bc4b190ad286e41411bce92023e00eb7a1d
-SIZE (rust/2025-04-02/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88062036
-SHA256 (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 8bef59b74196fa9f7839bb491f6b32d0761a45c8d7178980ee3afd80231b836e
-SIZE (rust/2025-04-02/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 28281300
-SHA256 (rust/2025-04-02/cargo-beta-x86_64-unknown-freebsd.tar.xz) = eae168df54ddfe95db669c205ae97baa902056722856fa174758ebd058168a95
-SIZE (rust/2025-04-02/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10577536
+TIMESTAMP = 1748343065
+SHA256 (rust/2025-05-26/rustc-nightly-src.tar.xz) = 33a1aa7e10e591abe3e1c5315163f33f56fd3da50bb0df4660f3a3ad00407b60
+SIZE (rust/2025-05-26/rustc-nightly-src.tar.xz) = 282590168
+SHA256 (rust/2025-05-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 6930ccd83b6b63d0a876eb5ac52c32a8449fd4cea8666b919494ce6358c6122c
+SIZE (rust/2025-05-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88300072
+SHA256 (rust/2025-05-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = a930b94bc005ce2b09b4d67abf47bfeafad8c7ab6ca5c15acc10e023818e7b25
+SIZE (rust/2025-05-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27730396
+SHA256 (rust/2025-05-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = d8f73cb808471883a5f6ee8db3dd5165fff5084ae744f4ffdca89fb545faaba8
+SIZE (rust/2025-05-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10575040
diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs
index 3e9a42a7f8dd..207c262c004a 100644
--- a/lang/rust-nightly/files/patch-vendor_cc.rs
+++ b/lang/rust-nightly/files/patch-vendor_cc.rs
@@ -1,75 +1,75 @@
 When the compiler has "clang" in its name the cc crate will pass
 an LLVM target triple to it.  Rust uses a triple that lacks the OS
 version and LLVM will default to FreeBSD 9 behavior, i.e., it will
 default to libstdc++ which is no longer available in newer releases.
 
 To avoid this issue assume we have a GNU compatible toolchain instead
 until LLVM can be updated to use libc++ by default.
 
 https://reviews.llvm.org/D77776
 
 --- vendor/cc-1.0.99/src/tool.rs.orig	2024-12-10 13:16:09 UTC
 +++ vendor/cc-1.0.99/src/tool.rs
 @@ -167,9 +167,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc) {
                  (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, false, _) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, false, _) => Ok(ToolFamily::Gnu),
                  (false, false, true) => Ok(ToolFamily::Gnu),
                  (false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
 --- vendor/cc-1.2.0/src/tool.rs.orig	2024-12-10 13:16:09 UTC
 +++ vendor/cc-1.2.0/src/tool.rs
 @@ -174,9 +174,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
 --- vendor/cc-1.2.16/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.16/src/tool.rs
 @@ -141,9 +141,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
---- vendor/cc-1.2.17/src/tool.rs.orig	2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.17/src/tool.rs
+--- vendor/cc-1.2.22/src/tool.rs.orig	2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.22/src/tool.rs
 @@ -141,9 +141,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
---- vendor/cc-1.2.21/src/tool.rs.orig	2025-04-01 18:22:03 UTC
-+++ vendor/cc-1.2.21/src/tool.rs
+--- vendor/cc-1.2.23/src/tool.rs.orig	2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.23/src/tool.rs
 @@ -141,9 +141,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
diff --git a/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs b/lang/rust-nightly/files/patch-vendor_git2-0.20.2_src_lib.rs
similarity index 79%
rename from lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs
rename to lang/rust-nightly/files/patch-vendor_git2-0.20.2_src_lib.rs
index 1676f0c23188..116d0b1fd583 100644
--- a/lang/rust-nightly/files/patch-vendor_git2-0.20.0_src_lib.rs
+++ b/lang/rust-nightly/files/patch-vendor_git2-0.20.2_src_lib.rs
@@ -1,18 +1,18 @@
---- vendor/git2-0.20.0/src/lib.rs.orig	2025-02-21 20:02:44 UTC
-+++ vendor/git2-0.20.0/src/lib.rs
+--- vendor/git2-0.20.2/src/lib.rs.orig	2025-02-21 20:02:44 UTC
++++ vendor/git2-0.20.2/src/lib.rs
 @@ -759,6 +759,7 @@ fn init() {
      unix,
      not(target_os = "macos"),
      not(target_os = "ios"),
 +    not(target_os = "freebsd"),
      feature = "https"
  ))]
  fn openssl_env_init() {
 @@ -880,6 +881,7 @@ fn openssl_env_init() {
      windows,
      target_os = "macos",
      target_os = "ios",
 +    target_os = "freebsd",
      not(feature = "https")
  ))]
  fn openssl_env_init() {}