diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 5314398ce9a2..6265bbaf5c22 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -574,7 +574,7 @@ pub fn parse(args: &[String]) -> Config {
             include_path.push("src");
             include_path.push("bootstrap");
             include_path.push("defaults");
-            include_path.push(format!("config.toml.{}", include));
+            include_path.push(format!("config.{}.toml", include));
             let included_toml = get_toml(&include_path);
             toml.merge(included_toml);
         }
diff --git a/src/bootstrap/defaults/config.toml.codegen b/src/bootstrap/defaults/config.codegen.toml
similarity index 100%
rename from src/bootstrap/defaults/config.toml.codegen
rename to src/bootstrap/defaults/config.codegen.toml
diff --git a/src/bootstrap/defaults/config.toml.compiler b/src/bootstrap/defaults/config.compiler.toml
similarity index 100%
rename from src/bootstrap/defaults/config.toml.compiler
rename to src/bootstrap/defaults/config.compiler.toml
diff --git a/src/bootstrap/defaults/config.toml.library b/src/bootstrap/defaults/config.library.toml
similarity index 100%
rename from src/bootstrap/defaults/config.toml.library
rename to src/bootstrap/defaults/config.library.toml
diff --git a/src/bootstrap/defaults/config.toml.user b/src/bootstrap/defaults/config.user.toml
similarity index 100%
rename from src/bootstrap/defaults/config.toml.user
rename to src/bootstrap/defaults/config.user.toml
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs
index 9d3a889aa008..8a77641fbfef 100644
--- a/src/bootstrap/setup.rs
+++ b/src/bootstrap/setup.rs
@@ -20,7 +20,7 @@ pub fn setup(src_path: &Path, include_name: &str) {
             file.display()
         );
         println!(
-            "note: this will use the configuration in {}/src/bootstrap/defaults/config.toml.{}",
+            "note: this will use the configuration in {}/src/bootstrap/defaults/config.{}.toml",
             src_path.display(),
             include_name
         );
@@ -36,7 +36,7 @@ pub fn setup(src_path: &Path, include_name: &str) {
     t!(fs::write(path, settings));
 
     let include_path =
-        format!("{}/src/bootstrap/defaults/config.toml.{}", src_path.display(), include_name);
+        format!("{}/src/bootstrap/defaults/config.{}.toml", src_path.display(), include_name);
     println!("`x.py` will now use the configuration at {}", include_path);
 
     let suggestions = match include_name {