diff --git a/configure b/configure
index d6dded6dc5f7b..143ffa4735c57 100755
--- a/configure
+++ b/configure
@@ -449,7 +449,7 @@ opt save-analysis 0 "save API analysis data"
 opt option-checking 1 "complain about unrecognized options in this configure script"
 opt ninja 0 "build LLVM using the Ninja generator (for MSVC, requires building in the correct environment)"
 opt locked-deps 0 "force Cargo.lock to be up to date"
-opt vendor 0 "enable usage of vendored Rust crates"
+opt vendor 1 "enable usage of vendored Rust crates"
 opt sanitizers 0 "build the sanitizer runtimes (asan, lsan, msan, tsan)"
 opt dist-src 1 "when building tarballs enables building a source tarball"
 opt cargo-openssl-static 0 "static openssl in cargo"
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index b326f95e505fb..764d36f0008e1 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -560,6 +560,10 @@ def bootstrap():
             print('      does not work you should run a normal build first')
             print('      before running a command like `sudo make install`')
 
+    if '\nvendor = false' in rb.config_toml or \
+       'CFG_DISABLE_VENDOR' in rb.config_mk:
+        rb.use_vendored_sources = False
+
     if rb.use_vendored_sources:
         if not os.path.exists('.cargo'):
             os.makedirs('.cargo')