diff --git a/.gitmodules b/.gitmodules
index e22d576279042..9150bd75fb055 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,8 @@
 	url = https://github.com/rust-lang/nomicon.git
 [submodule "src/tools/cargo"]
 	path = src/tools/cargo
-	url = https://github.com/rust-lang/cargo.git
+	url = https://github.com/ehuss/cargo.git
+	branch = "2021-crater"
 [submodule "src/doc/reference"]
 	path = src/doc/reference
 	url = https://github.com/rust-lang/reference.git
diff --git a/Cargo.lock b/Cargo.lock
index 9e0624c57ae94..0f62e55de0eda 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -294,6 +294,7 @@ dependencies = [
  "openssl",
  "percent-encoding 2.1.0",
  "pretty_env_logger",
+ "regex",
  "rustc-workspace-hack",
  "rustfix 0.6.0",
  "semver 1.0.3",
diff --git a/src/tools/cargo b/src/tools/cargo
index e96bdb0c3d0a4..6901690a6f8d5 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit e96bdb0c3d0a418e7fcd7fbd69be08abf830b4bc
+Subproject commit 6901690a6f8d519efb4fabf48c1c2b94af0c3bd8