diff --git a/CHANGELIST.md b/CHANGELIST.md
index bdd61ff0..a2333bc9 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -16,6 +16,7 @@
 - Add optional file deletion
 - Rearrange OptionsWindow to be easier to navigate
 - Fix up DumpEnvironment a bit
+- Add filename suffix setting (nw)
 
 ### 2.7.2 (2023-10-17)
 
diff --git a/MPF.Core/Data/Options.cs b/MPF.Core/Data/Options.cs
index b61e3abf..f3a18cc8 100644
--- a/MPF.Core/Data/Options.cs
+++ b/MPF.Core/Data/Options.cs
@@ -475,6 +475,15 @@ namespace MPF.Core.Data
             set { Settings["ToolsInSeparateWindow"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Add the dump filename as a suffix to the auto-generated files
+        /// </summary>
+        public bool AddFilenameSuffix
+        {
+            get { return GetBooleanSetting(Settings, "AddFilenameSuffix", false); }
+            set { Settings["AddFilenameSuffix"] = value.ToString(); }
+        }
+
         /// <summary>
         /// Output the compressed JSON version of the submission info
         /// </summary>