diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 395762ac5a55..09c657ba5ae1 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,23 +1,23 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 
 # Run update.sh to update to the latest nightly
 PORTVERSION=	1.54.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=		2021-05-17
-BOOTSTRAPS_DATE=	2021-04-07
+NIGHTLY_DATE=		2021-06-05
+BOOTSTRAPS_DATE=	2021-05-23
 RUST_BOOTSTRAP_VERSION=	beta
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 44265e66fb1e..d8fa5102a7c7 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1621239140
-SHA256 (rust/2021-05-17/rustc-nightly-src.tar.xz) = 3d30721f042e5ca6f8bfb21562425f6417b046aa5cade2f1bb2b58541a5a217c
-SIZE (rust/2021-05-17/rustc-nightly-src.tar.xz) = 115672120
-SHA256 (rust/2021-04-07/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 25bb0c202ba2da32242309b6770cb852bd529da1618274f44e8a6811798ff4b6
-SIZE (rust/2021-04-07/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 81028224
-SHA256 (rust/2021-04-07/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 155306cd12408adbd8229fcd55705cf70f84d246069b3144847526036ab5b91c
-SIZE (rust/2021-04-07/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 24564736
-SHA256 (rust/2021-04-07/cargo-beta-x86_64-unknown-freebsd.tar.xz) = a9a7056d8e6aa8a269b892469d4cae3141134184691ab41bab567a56761f213b
-SIZE (rust/2021-04-07/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6221320
+TIMESTAMP = 1622871253
+SHA256 (rust/2021-06-05/rustc-nightly-src.tar.xz) = 29cffe1cbbc9b7ed8f4a2e9462668003319047d1b4629ac60f4939e0fc087cf6
+SIZE (rust/2021-06-05/rustc-nightly-src.tar.xz) = 116190356
+SHA256 (rust/2021-05-23/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 310aecc7b2614640c52abbc1f8604e01bb7b2b5bbcdf7f00240739922351282a
+SIZE (rust/2021-05-23/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 81197824
+SHA256 (rust/2021-05-23/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f3682845f5be72f00a669670de5c683174825c815316aa96e4c975bf01682deb
+SIZE (rust/2021-05-23/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 26311128
+SHA256 (rust/2021-05-23/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 797e510526d84bb3ddb685148dd9bc4f590f22223bb64737ecad552874c31b86
+SIZE (rust/2021-05-23/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6261656