diff --git a/.gitignore b/.gitignore
index f380e795cb..ad3297ca3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 *.rar
 *.log
 settings.ron
+server_settings.ron
 run.sh
 maps
 screenshots
diff --git a/server/src/settings.rs b/server/src/settings.rs
index 12c6fc157f..0a04f8225a 100644
--- a/server/src/settings.rs
+++ b/server/src/settings.rs
@@ -121,9 +121,9 @@ impl ServerSettings {
             start_time: 9.0 * 3600.0,
             admins: vec!["singleplayer".to_string()], /* TODO: Let the player choose if they want
                                                        * to use admin commands or not */
-            ..load // Fill in remaining fields from settings.ron.
+            ..load // Fill in remaining fields from server_settings.ron.
         }
     }
 
-    fn get_settings_path() -> PathBuf { PathBuf::from(r"settings.ron") }
+    fn get_settings_path() -> PathBuf { PathBuf::from(r"server_settings.ron") }
 }