diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index ce7cde8fc9494..86180077b82f8 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -347,7 +347,7 @@ impl Build {
 
         // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
         // Force cargo to output binaries with disambiguating hashes in the name
-        cargo.env("__CARGO_DEFAULT_LIB_METADATA", "1");
+        cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
 
         let stage;
         if compiler.stage == 0 && self.local_rebuild {
diff --git a/src/tools/cargo b/src/tools/cargo
index abf01e1eddb31..d2d6e675fcb70 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit abf01e1eddb3145c83f71b469ea7bee37141e5e1
+Subproject commit d2d6e675fcb70cfb91c2cf2fad8cdd345c120316