diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 9f6ef3c3a..5bf2aba69 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -393,6 +393,10 @@
         <name>naomi</name>
         <systemsortname>Arcade - 1998</systemsortname>
     </system>
+    <system>
+        <name>naomi2</name>
+        <systemsortname>Arcade - 2000</systemsortname>
+    </system>
     <system>
         <name>naomigd</name>
         <systemsortname>Arcade - 1998</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index 644950ee5..9e1dd6075 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -393,6 +393,10 @@
         <name>naomi</name>
         <systemsortname>Sega - Arcade - 1998</systemsortname>
     </system>
+    <system>
+        <name>naomi2</name>
+        <systemsortname>Sega - Arcade - 2000</systemsortname>
+    </system>
     <system>
         <name>naomigd</name>
         <systemsortname>Sega - Arcade - 1998</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index b8d551bb7..b2e5451ab 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -393,6 +393,10 @@
         <name>naomi</name>
         <systemsortname>Sega - 1998</systemsortname>
     </system>
+    <system>
+        <name>naomi2</name>
+        <systemsortname>Sega - 2000</systemsortname>
+    </system>
     <system>
         <name>naomigd</name>
         <systemsortname>Sega - 1998</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index 12f34ecb4..8b3c6ee9a 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -393,6 +393,10 @@
         <name>naomi</name>
         <systemsortname>1998</systemsortname>
     </system>
+    <system>
+        <name>naomi2</name>
+        <systemsortname>2000</systemsortname>
+    </system>
     <system>
         <name>naomigd</name>
         <systemsortname>1998</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 9340eca48..e9ffbc956 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1084,6 +1084,16 @@
         <platform>arcade</platform>
         <theme>naomi</theme>
     </system>
+    <system>
+        <name>naomi2</name>
+        <fullname>Sega NAOMI 2</fullname>
+        <path>%ROMPATH%/naomi2</path>
+        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%</command>
+        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
+        <platform>arcade</platform>
+        <theme>naomi2</theme>
+    </system>
     <system>
         <name>naomigd</name>
         <fullname>Sega NAOMI GD-ROM</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 2a7f6fb0d..0c292a747 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1127,6 +1127,16 @@
         <platform>arcade</platform>
         <theme>naomi</theme>
     </system>
+    <system>
+        <name>naomi2</name>
+        <fullname>Sega NAOMI 2</fullname>
+        <path>%ROMPATH%/naomi2</path>
+        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
+        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
+        <platform>arcade</platform>
+        <theme>naomi2</theme>
+    </system>
     <system>
         <name>naomigd</name>
         <fullname>Sega NAOMI GD-ROM</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 7ba3e09a2..91dc929f5 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1126,6 +1126,16 @@
         <platform>arcade</platform>
         <theme>naomi</theme>
     </system>
+    <system>
+        <name>naomi2</name>
+        <fullname>Sega NAOMI 2</fullname>
+        <path>%ROMPATH%\naomi2</path>
+        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
+        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
+        <platform>arcade</platform>
+        <theme>naomi2</theme>
+    </system>
     <system>
         <name>naomigd</name>
         <fullname>Sega NAOMI GD-ROM</fullname>