diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 3b4940e59f4c..9776b097bec0 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1386,6 +1386,10 @@ impl Step for Extended {
             tarballs.push(builder.ensure(Docs { host: target }));
         }
 
+        if target.contains("windows-gnu") {
+            tarballs.push(builder.ensure(Mingw { host: target }).expect("missing mingw"));
+        }
+
         if builder.config.profiler_enabled(target)
             || should_build_extended_tool(builder, "rust-demangler")
         {
@@ -1404,8 +1408,6 @@ impl Step for Extended {
         add_tool!("miri" => Miri { compiler, target });
         add_tool!("analysis" => Analysis { compiler, target });
 
-        let mingw_installer = builder.ensure(Mingw { host: target });
-
         let etc = builder.src.join("src/etc/installer");
 
         // Avoid producing tarballs during a dry run.
@@ -1413,10 +1415,6 @@ impl Step for Extended {
             return;
         }
 
-        if target.contains("pc-windows-gnu") {
-            tarballs.push(mingw_installer.unwrap());
-        }
-
         let tarball = Tarball::new(builder, "rust", &target.triple);
         let generated = tarball.combine(&tarballs);