diff --git a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
index dd77f20..a8d6a4c 100644
--- a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
+++ b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
@@ -1494,6 +1494,7 @@ namespace SabreTools.RedumpLib.Test.Data
             [PhysicalSystem.NamcoPurikura] = SystemCategory.Arcade,
             [PhysicalSystem.NamcoSegaNintendoTriforce] = SystemCategory.Arcade,
             [PhysicalSystem.NamcoSystem12] = SystemCategory.Arcade,
+            [PhysicalSystem.NamcoSystem22] = SystemCategory.Arcade,
             [PhysicalSystem.NamcoSystem246256] = SystemCategory.Arcade,
             [PhysicalSystem.NewJatreCDi] = SystemCategory.Arcade,
             [PhysicalSystem.NichibutsuHighRateSystem] = SystemCategory.Arcade,
@@ -1851,6 +1852,7 @@ namespace SabreTools.RedumpLib.Test.Data
             PhysicalSystem.NamcoPurikura,
             PhysicalSystem.NamcoSegaNintendoTriforce,
             PhysicalSystem.NamcoSystem12,
+            PhysicalSystem.NamcoSystem22,
             PhysicalSystem.NamcoSystem246256,
             PhysicalSystem.NichibutsuHighRateSystem,
             PhysicalSystem.NichibutsuSuperCD,
diff --git a/SabreTools.RedumpLib/Data/Enumerations.cs b/SabreTools.RedumpLib/Data/Enumerations.cs
index 673c8ab..5195cc9 100644
--- a/SabreTools.RedumpLib/Data/Enumerations.cs
+++ b/SabreTools.RedumpLib/Data/Enumerations.cs
@@ -2457,9 +2457,13 @@ namespace SabreTools.RedumpLib.Data
         [System(Category = SystemCategory.Arcade, LongName = "Namco · Sega · Nintendo Triforce", ShortName = "TRF", RedumpOrgCode = "trf", HasCues = true, HasDat = true, HasGdi = true)]
         NamcoSegaNintendoTriforce,
 
-        [System(Category = SystemCategory.Arcade, LongName = "Namco System 12", ShortName = "ns12", RedumpOrgCode = "ns12")]
+        [System(Category = SystemCategory.Arcade, LongName = "Namco System 12", ShortName = "NS12", RedumpOrgCode = "ns12")]
         NamcoSystem12,
 
+        // Short name currently undefined
+        [System(Category = SystemCategory.Arcade, Available = false, LongName = "Namco System 22", ShortName = "NS22")]
+        NamcoSystem22,
+
         // TODO: Split if/when separate 246 and 256 are defined
         [System(Category = SystemCategory.Arcade, LongName = "Namco System 246 / System 256", ShortName = "NS246", RedumpOrgCode = "ns246", HasCues = true, HasDat = true)]
         NamcoSystem246256,
diff --git a/SabreTools.RedumpLib/Data/Extensions.cs b/SabreTools.RedumpLib/Data/Extensions.cs
index 2bb1a05..7e0faa0 100644
--- a/SabreTools.RedumpLib/Data/Extensions.cs
+++ b/SabreTools.RedumpLib/Data/Extensions.cs
@@ -702,6 +702,11 @@ namespace SabreTools.RedumpLib.Data
                     types.Add(PhysicalMediaType.CDROM);
                     break;
 
+                // https://system16.com/hardware.php?id=537
+                case PhysicalSystem.NamcoSystem22:
+                    types.Add(PhysicalMediaType.CDROM);
+                    break;
+
                 // https://www.arcade-history.com/?n=the-yakyuuken-part-1&page=detail&id=33049
                 case PhysicalSystem.NewJatreCDi:
                     types.Add(PhysicalMediaType.CDROM);