diff --git a/.gitignore b/.gitignore
index 5796665d..4a12ed11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,5 @@ third_party/linux/
 benchmarks/smoke-repo/
 review_trees/
 sashiko.log
-Settings.toml
+Settings.local.toml
 email_policy.toml
diff --git a/src/settings.rs b/src/settings.rs
index 368772b0..f74f5d78 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -268,6 +268,7 @@ impl Settings {
         let s = Config::builder()
             // Start with default settings
             .add_source(File::with_name("Settings"))
+            .add_source(File::with_name("Settings.local").required(false))
             // Add settings from environment variables (with a prefix of SASHIKO)
             // e.g. SASHIKO_SERVER__PORT=8081 would set the server port
             .add_source(Environment::with_prefix("SASHIKO").separator("__"))