diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 34bd62d300d..5b5e9e0def2 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -310,7 +310,9 @@ fn main() {
         let crate_name = crate_name[1].to_string_lossy();
         if crate_name.starts_with("rustc") || crate_name.starts_with("syntax") {
             cmd.arg("-Zunstable-options");
-            cmd.arg("-Winternal");
+            if stage != "0" {
+                cmd.arg("-Wrustc::internal");
+            }
         }
     }
 
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index d3e35589652..8053c73849d 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -497,7 +497,7 @@ pub fn register_internals(store: &mut lint::LintStore, sess: Option<&Session>) {
     store.register_group(
         sess,
         false,
-        "internal",
+        "rustc::internal",
         None,
         vec![
             LintId::of(DEFAULT_HASH_TYPES),