diff --git a/MPF.Library/Data/DumpEnvironment.cs b/MPF.Library/Data/DumpEnvironment.cs
index e0ddb804..838b219e 100644
--- a/MPF.Library/Data/DumpEnvironment.cs
+++ b/MPF.Library/Data/DumpEnvironment.cs
@@ -603,7 +603,7 @@ namespace MPF.Data
             };
 
             // Get specific tool output handling
-            Parameters.GenerateSubmissionInfo(info, combinedBase, this.Drive, Options.OutputSubmissionJSON);
+            Parameters.GenerateSubmissionInfo(info, combinedBase, this.Drive, Options.IncludeArtifacts);
 
             // Get a list of matching IDs for each line in the DAT
             if (!string.IsNullOrEmpty(info.TracksAndWriteOffsets.ClrMameProData) && Options.HasRedumpLogin)
diff --git a/MPF.Library/Data/Options.cs b/MPF.Library/Data/Options.cs
index 699db978..34383792 100644
--- a/MPF.Library/Data/Options.cs
+++ b/MPF.Library/Data/Options.cs
@@ -296,6 +296,15 @@ namespace MPF.Data
             set { _settings["OutputSubmissionJSON"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Include log files in serialized JSON data
+        /// </summary>
+        public bool IncludeArtifacts
+        {
+            get { return GetBooleanSetting(_settings, "IncludeArtifacts", false); }
+            set { _settings["IncludeArtifacts"] = value.ToString(); }
+        }
+
         /// <summary>
         /// Compress output log files to reduce space
         /// </summary>
diff --git a/MPF/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml
index ea7f02c9..7a066e97 100644
--- a/MPF/Windows/OptionsWindow.xaml
+++ b/MPF/Windows/OptionsWindow.xaml
@@ -177,6 +177,11 @@
                                      ToolTip="Enable outputting a compressed JSON version of the submission info" Margin="0,4"
                                      />
 
+                                <CheckBox VerticalAlignment="Center" Content="Include Artifacts"
+                                     IsChecked="{Binding Options.IncludeArtifacts}"  IsEnabled="{Binding Options.OutputSubmissionJSON}"
+                                     ToolTip="Include log files in serialized JSON data" Margin="0,4"
+                                     />
+
                                 <CheckBox VerticalAlignment="Center" Content="Compress Log Files"
                                      IsChecked="{Binding Options.CompressLogFiles}"
                                      ToolTip="Compress output log files to reduce space" Margin="0,4"