diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs
index 83eba6895a7..5f8733e6959 100644
--- a/src/bin/cargo/cli.rs
+++ b/src/bin/cargo/cli.rs
@@ -125,26 +125,32 @@ fn print_zhelp(gctx: &GlobalContext) {
     drop_println!(
         gctx,
         "\
-{header}Available unstable (nightly-only) flags:{header:#}
+{header}Available unstable (nightly-only) cargo flags:{header:#}
 
 {z_flags}
 
 Run with `{literal}cargo -Z{literal:#} {placeholder}[FLAG] [COMMAND]{placeholder:#}`",
     );
     if !gctx.nightly_features_allowed {
-        drop_println!(
-            gctx,
-            "\nUnstable flags are only available on the nightly channel \
-                 of Cargo, but this is the `{}` channel.\n\
-                 {}",
-            features::channel(),
-            features::SEE_CHANNELS
+        let _ = gctx.shell().print_report(
+            &[Level::WARNING
+                .secondary_title(format!(
+                    "unstable flags are unavailable on the current (`{}`) channel",
+                    features::channel()
+                ))
+                .element(Level::HELP.message("run on the nightly channel to use them"))
+                .element(Level::HELP.message(format!(
+                    "see {} for more information about Rust release channels",
+                    features::SEE_CHANNELS
+                )))],
+            false,
         );
     }
     drop_println!(
         gctx,
         "\nSee https://doc.rust-lang.org/nightly/cargo/reference/unstable.html \
-             for more information about these flags."
+             for more information about these flags.\n\n\
+             note: to see rustc unstable features, run `rustc -Zhelp`"
     );
 }
 
diff --git a/tests/testsuite/cargo/z_help/stdout.term.svg b/tests/testsuite/cargo/z_help/stdout.term.svg
index c3feb8b2e72..75dba04db57 100644
--- a/tests/testsuite/cargo/z_help/stdout.term.svg
+++ b/tests/testsuite/cargo/z_help/stdout.term.svg
@@ -1,4 +1,4 @@
-<svg width="1255px" height="1010px" xmlns="http://www.w3.org/2000/svg">
+<svg width="1255px" height="1050px" xmlns="http://www.w3.org/2000/svg">
   <style>
     .fg { fill: #AAAAAA }
     .bg { fill: #000000 }
@@ -16,7 +16,7 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan>Available unstable (nightly-only) flags:</tspan>
+    <tspan x="10px" y="28px"><tspan>Available unstable (nightly-only) cargo flags:</tspan>
 </tspan>
     <tspan x="10px" y="46px">
 </tspan>
@@ -125,6 +125,10 @@
     <tspan x="10px" y="982px"><tspan>See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html for more information about these flags.</tspan>
 </tspan>
     <tspan x="10px" y="1000px">
+</tspan>
+    <tspan x="10px" y="1018px"><tspan>note: to see rustc unstable features, run `rustc -Zhelp`</tspan>
+</tspan>
+    <tspan x="10px" y="1036px">
 </tspan>
   </text>