diff --git a/src/rustup-cli/self_update.rs b/src/rustup-cli/self_update.rs
index 3817fd4a31..e04cb421c1 100644
--- a/src/rustup-cli/self_update.rs
+++ b/src/rustup-cli/self_update.rs
@@ -193,7 +193,8 @@ tools, but otherwise, install the C++ build tools before proceeding.
 "#;
 
 static TOOLS: &'static [&'static str] =
-    &["rustc", "rustdoc", "cargo", "rust-lldb", "rust-gdb", "rls", "cargo-clippy"];
+    &["rustc", "rustdoc", "cargo", "rust-lldb", "rust-gdb", "rls", "cargo-clippy",
+      "lldb", "lldb-mi"];
 
 // Tools which are commonly installed by Cargo as well as rustup. We take a bit
 // more care with these to ensure we don't overwrite the user's previous
diff --git a/src/rustup-win-installer/src/lib.rs b/src/rustup-win-installer/src/lib.rs
index fa2d0b90ea..399261f003 100644
--- a/src/rustup-win-installer/src/lib.rs
+++ b/src/rustup-win-installer/src/lib.rs
@@ -27,6 +27,8 @@ static TOOLS: &'static [&'static str] = &[
     "rustfmt",
     "cargo-fmt",
     "cargo-clippy",
+    "lldb",
+    "lldb-mi",
 ];
 
 #[no_mangle]