diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index a8f29a46d519..7869ade59257 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,30 +1,30 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 # $FreeBSD$
 
-PORTVERSION=	1.47.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.48.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 i386
 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
 
 OPTIONS_EXCLUDE=	DOCS
 
 # Get latest from top level 'date' key in
 # https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=	2020-08-24
+NIGHTLY_DATE=	2020-09-02
 
 # See WRKSRC/src/stage0.txt for this date
-BOOTSTRAPS_DATE=		2020-07-16
+BOOTSTRAPS_DATE=		2020-08-26
 RUST_BOOTSTRAP_VERSION=		beta
 CARGO_BOOTSTRAP_VERSION=	beta
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 7984048074fd..4b0697cfb18c 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1598251375
-SHA256 (rust/2020-08-24/rustc-nightly-src.tar.xz) = ea8819dfcc6ac38bad11ea89da093c11ccd214ea54cac5ec3ffb1c66711e342a
-SIZE (rust/2020-08-24/rustc-nightly-src.tar.xz) = 104120996
-SHA256 (rust/2020-07-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 423e43d67a25133ddfaa1874c9bd06d690fbfb127e76cbf4323a9564dfd92c26
-SIZE (rust/2020-07-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 42656972
-SHA256 (rust/2020-07-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = ef2c4ef506cb44b6344c7892d9c89beffb2cff81841321a329a3a88299d4bb34
-SIZE (rust/2020-07-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 15203328
-SHA256 (rust/2020-07-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = cca2804f66744b5885b83bc680c8e34089fdf483c03f685e8564a6afebe08eea
-SIZE (rust/2020-07-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5224968
-SHA256 (rust/2020-07-16/rustc-beta-i686-unknown-freebsd.tar.xz) = bbc0379710294617c2c6978af65fe468c8a78d45e318cf4accb32a6e42ccd23e
-SIZE (rust/2020-07-16/rustc-beta-i686-unknown-freebsd.tar.xz) = 43099244
-SHA256 (rust/2020-07-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 0c90438aed313acf97a4e306c42af60de1d65aac72bdc8dc97acbc741e949e1b
-SIZE (rust/2020-07-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 15064244
-SHA256 (rust/2020-07-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 1fa107caeab6328d98b71e0be47f9af02e9586c46d6304a8253b96e7c52faa51
-SIZE (rust/2020-07-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 5093508
+TIMESTAMP = 1599047852
+SHA256 (rust/2020-09-02/rustc-nightly-src.tar.xz) = 6b969647550a5d007a0e919e52d0987eef229b3a90eac69614bf11d4fb31b7fe
+SIZE (rust/2020-09-02/rustc-nightly-src.tar.xz) = 105287016
+SHA256 (rust/2020-08-26/rustc-beta-x86_64-unknown-freebsd.tar.xz) = ab44093ffbeaccf59ac9f0a8c89243692795787db18e7e8d96c6a748ab6a5ab4
+SIZE (rust/2020-08-26/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 47044368
+SHA256 (rust/2020-08-26/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = e7c7b1e08e728dc4267c6ea1bcc6c321a1d1c38003b355c57d3939e5ae981461
+SIZE (rust/2020-08-26/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 21608628
+SHA256 (rust/2020-08-26/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 39b41d2098375c4f550547b9ac4e9ea731a32b70551d0f92fcba41a91d8d1d80
+SIZE (rust/2020-08-26/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5472752
+SHA256 (rust/2020-08-26/rustc-beta-i686-unknown-freebsd.tar.xz) = de176b72e481d2375f8d096605b6d86cfc2ad6da40c48c8d379c857945f478c2
+SIZE (rust/2020-08-26/rustc-beta-i686-unknown-freebsd.tar.xz) = 48449408
+SHA256 (rust/2020-08-26/rust-std-beta-i686-unknown-freebsd.tar.xz) = 1be3bce68a93fe763c2e1abe0c2c3a5ebab7257f3d7dbb23487d424e79ee52ab
+SIZE (rust/2020-08-26/rust-std-beta-i686-unknown-freebsd.tar.xz) = 20519076
+SHA256 (rust/2020-08-26/cargo-beta-i686-unknown-freebsd.tar.xz) = e1da1b54438f24d9743dd101af2991f58e8d83c9c15efdf79a30d260e1087394
+SIZE (rust/2020-08-26/cargo-beta-i686-unknown-freebsd.tar.xz) = 5421420
diff --git a/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
similarity index 73%
rename from lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
rename to lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
index 75c659e6501d..9d3dc5a067aa 100644
--- a/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
+++ b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
@@ -1,11 +1,11 @@
---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2020-01-23 19:40:44 UTC
-+++ src/librustc_target/spec/i686_unknown_freebsd.rs
+--- compiler/rustc_target/src/spec/i686_unknown_freebsd.rs.orig	2020-01-23 19:40:44 UTC
++++ compiler/rustc_target/src/spec/i686_unknown_freebsd.rs
 @@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
  
  pub fn target() -> TargetResult {
      let mut base = super::freebsd_base::opts();
 -    base.cpu = "pentium4".to_string();
 +    base.cpu = "pentiumpro".to_string();
      base.max_atomic_width = Some(64);
      let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap();
      pre_link_args.push("-m32".to_string());