diff --git a/DICUI.Library/Data/Enumerations.cs b/DICUI.Library/Data/Enumerations.cs
index d4ad57af..fdc24524 100644
--- a/DICUI.Library/Data/Enumerations.cs
+++ b/DICUI.Library/Data/Enumerations.cs
@@ -70,6 +70,7 @@
 
         #region Consoles
 
+        AtariJaguarCD,
         BandaiPlaydiaQuickInteractiveSystem,
         BandaiApplePippin,
         CommodoreAmigaCD32,
diff --git a/DICUI.Library/Utilities/Converters.cs b/DICUI.Library/Utilities/Converters.cs
index 033513da..70d3ee28 100644
--- a/DICUI.Library/Utilities/Converters.cs
+++ b/DICUI.Library/Utilities/Converters.cs
@@ -629,6 +629,8 @@ namespace DICUI.Utilities
             {
                 #region Consoles
 
+                case KnownSystem.AtariJaguarCD:
+                    return "Atari Jaguar CD";
                 case KnownSystem.BandaiPlaydiaQuickInteractiveSystem:
                     return "Bandai Playdia Quick Interactive System";
                 case KnownSystem.BandaiApplePippin:
@@ -876,6 +878,8 @@ namespace DICUI.Utilities
             {
                 #region Consoles
 
+                case KnownSystem.AtariJaguarCD:
+                    return "jaguar";
                 case KnownSystem.BandaiPlaydiaQuickInteractiveSystem:
                     return "playdia";
                 case KnownSystem.BandaiApplePippin:
@@ -1123,6 +1127,15 @@ namespace DICUI.Utilities
             {
                 #region Consoles
 
+                case "jaguar":
+                case "jagcd":
+                case "jaguarcd":
+                case "jaguar cd":
+                case "atarijaguar":
+                case "atarijagcd":
+                case "atarijaguarcd":
+                case "atari jaguar cd":
+                    return KnownSystem.AtariJaguarCD;
                 case "playdia":
                 case "playdiaqis":
                 case "playdiaquickinteractivesystem":
diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs
index 8569b2f5..c389ccad 100644
--- a/DICUI.Library/Utilities/DumpEnvironment.cs
+++ b/DICUI.Library/Utilities/DumpEnvironment.cs
@@ -290,6 +290,9 @@ namespace DICUI.Utilities
             // First, sanitized the output filename to strip off any potential extension
             string outputFilename = Path.GetFileNameWithoutExtension(OutputFilename);
 
+            // Some disc types are audio-only
+            bool audioOnly = (System == KnownSystem.AtariJaguarCD) || (System == KnownSystem.AudioCD);
+
             // Now ensure that all required files exist
             string combinedBase = Path.Combine(OutputDirectory, outputFilename);
             switch (Type)
@@ -301,8 +304,8 @@ namespace DICUI.Utilities
                         && File.Exists(combinedBase + ".cue")
                         && File.Exists(combinedBase + ".dat")
                         && File.Exists(combinedBase + ".img")
-                        && (System == KnownSystem.AudioCD || File.Exists(combinedBase + ".img_EdcEcc.txt") || File.Exists(combinedBase + ".img_EccEdc.txt"))
-                        && (System == KnownSystem.AudioCD || File.Exists(combinedBase + ".scm"))
+                        && (audioOnly || File.Exists(combinedBase + ".img_EdcEcc.txt") || File.Exists(combinedBase + ".img_EccEdc.txt"))
+                        && (audioOnly || File.Exists(combinedBase + ".scm"))
                         && File.Exists(combinedBase + ".sub")
                         && File.Exists(combinedBase + "_c2Error.txt")
                         && File.Exists(combinedBase + "_cmd.txt")
diff --git a/DICUI.Library/Utilities/Validators.cs b/DICUI.Library/Utilities/Validators.cs
index c3286046..31bf29cb 100644
--- a/DICUI.Library/Utilities/Validators.cs
+++ b/DICUI.Library/Utilities/Validators.cs
@@ -25,6 +25,9 @@ namespace DICUI.Utilities
             {
                 #region Consoles
 
+                case KnownSystem.AtariJaguarCD:
+                    types.Add(MediaType.CDROM);
+                    break;
                 case KnownSystem.BandaiPlaydiaQuickInteractiveSystem:
                     types.Add(MediaType.CDROM);
                     break;