diff --git a/src/cargo/util/diagnostic_server.rs b/src/cargo/util/diagnostic_server.rs
index e7e1aff1bb7..98ca15b60ed 100644
--- a/src/cargo/util/diagnostic_server.rs
+++ b/src/cargo/util/diagnostic_server.rs
@@ -23,8 +23,10 @@ const PLEASE_REPORT_THIS_BUG: &str =
      and we would appreciate a bug report! You're likely to see \n\
      a number of compiler warnings after this message which cargo\n\
      attempted to fix but failed. If you could open an issue at\n\
-     https://github.com/rust-lang/cargo/issues\n\
-     quoting the full output of this command we'd be very appreciative!\n\n\
+     https://github.com/rust-lang/rust/issues\n\
+     quoting the full output of this command we'd be very appreciative!\n\
+     Note that you may be able to make some more progress in the near-term\n\
+     fixing code with the `--broken-code` flag\n\n\
      ";
 
 #[derive(Deserialize, Serialize)]
diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs
index b37e3756937..89c81fd42a8 100644
--- a/tests/testsuite/fix.rs
+++ b/tests/testsuite/fix.rs
@@ -155,8 +155,10 @@ fn broken_fixes_backed_out() {
              and we would appreciate a bug report! You're likely to see \n\
              a number of compiler warnings after this message which cargo\n\
              attempted to fix but failed. If you could open an issue at\n\
-             https://github.com/rust-lang/cargo/issues\n\
+             [..]\n\
              quoting the full output of this command we'd be very appreciative!\n\
+             Note that you may be able to make some more progress in the near-term\n\
+             fixing code with the `--broken-code` flag\n\
              \n\
              The following errors were reported:\n\
              error: expected one of `!` or `::`, found `rust`\n\