diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index db34ce7d390b..44c0a285cde8 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.86.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.87.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-01-15
-BOOTSTRAPS_DATE=	2025-01-08
+NIGHTLY_DATE=		2025-03-04
+BOOTSTRAPS_DATE=	2025-02-18
 RUST_BOOTSTRAP_VERSION=	beta
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 31c65de75a9b..a5ebba10c144 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1737057085
-SHA256 (rust/2025-01-15/rustc-nightly-src.tar.xz) = f4d8a783a6dad307151159bf9bcabd5b8e8cfa61e5b3053529aeb20b48d6026b
-SIZE (rust/2025-01-15/rustc-nightly-src.tar.xz) = 359121224
-SHA256 (rust/2025-01-08/rustc-beta-x86_64-unknown-freebsd.tar.xz) = c9e699c5fdbf0af0434354caf8745796db42a931669e733b3a7432baabf81974
-SIZE (rust/2025-01-08/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 79860216
-SHA256 (rust/2025-01-08/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = ce6967397e9dcf20c700957d5ef3a8fbe35795f0b7be1e8f2fc61ebebdd9771d
-SIZE (rust/2025-01-08/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 29762976
-SHA256 (rust/2025-01-08/cargo-beta-x86_64-unknown-freebsd.tar.xz) = e853f0e42602ff80f64fe245863ba0a4f50d8197ab4cde56c4bed53f4d7d9cbb
-SIZE (rust/2025-01-08/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 9814360
+TIMESTAMP = 1741179896
+SHA256 (rust/2025-03-04/rustc-nightly-src.tar.xz) = 32ddf44f262b15f96500276ef3231919e2c9c2b4436cd73f3eb9fa6c01f13582
+SIZE (rust/2025-03-04/rustc-nightly-src.tar.xz) = 283076264
+SHA256 (rust/2025-02-18/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 52ab3212d64b56a8da207fe976cbc8d266e962a61c742e6069137b10ff25c3c1
+SIZE (rust/2025-02-18/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 85822636
+SHA256 (rust/2025-02-18/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 11bae401884cce0306b415bb1202c2c63f81395677057fbbe12e9302951a9d3d
+SIZE (rust/2025-02-18/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27638072
+SHA256 (rust/2025-02-18/cargo-beta-x86_64-unknown-freebsd.tar.xz) = c244ec4f97420c29c690e32bd6d8f14994bf1d990747f31a3dc0f2b37644493e
+SIZE (rust/2025-02-18/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10434836
diff --git a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs
index 45d479133343..9e9be66e56a3 100644
--- a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs
+++ b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_targets_i686__unknown__freebsd.rs
@@ -1,13 +1,13 @@
 i386 should be pentiumpro (no SSE2, no ...)
 
---- compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs.orig	2023-12-22 11:18:00 UTC
+--- compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs.orig	2025-03-03 19:34:25 UTC
 +++ compiler/rustc_target/src/spec/targets/i686_unknown_freebsd.rs
-@@ -2,7 +2,7 @@ pub fn target() -> Target {
- 
- pub fn target() -> Target {
+@@ -3,7 +3,7 @@ pub(crate) fn target() -> Target {
+ pub(crate) fn target() -> Target {
      let mut base = base::freebsd::opts();
+     base.rustc_abi = Some(RustcAbi::X86Sse2);
 -    base.cpu = "pentium4".into();
 +    base.cpu = "pentiumpro".into();
      base.max_atomic_width = Some(64);
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-znotext"]);
-     base.stack_probes = StackProbeType::X86;
+     base.stack_probes = StackProbeType::Inline;