diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 601383b85..ef20d543f 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -9,6 +9,10 @@
         <name>adam</name>
         <systemsortname>Computer - 1983</systemsortname>
     </system>
+    <system>
+        <name>ags</name>
+        <systemsortname>Engine - 1997</systemsortname>
+    </system>
     <system>
         <name>amiga</name>
         <systemsortname>Computer - 1985</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index 8b8a2ecc8..75bcea899 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -9,6 +9,10 @@
         <name>adam</name>
         <systemsortname>Coleco - Computer - 1983</systemsortname>
     </system>
+    <system>
+        <name>ags</name>
+        <systemsortname>Chris Jones - Engine - 1997</systemsortname>
+    </system>
     <system>
         <name>amiga</name>
         <systemsortname>Commodore - Computer - 1985</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index bcba05006..9b8d2ad20 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -9,6 +9,10 @@
         <name>adam</name>
         <systemsortname>Coleco - 1983</systemsortname>
     </system>
+    <system>
+        <name>ags</name>
+        <systemsortname>Chris Jones - 1997</systemsortname>
+    </system>
     <system>
         <name>amiga</name>
         <systemsortname>Commodore - 1985</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index 0a6523500..ab14be4cd 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -9,6 +9,10 @@
         <name>adam</name>
         <systemsortname>1983</systemsortname>
     </system>
+    <system>
+        <name>ags</name>
+        <systemsortname>1997</systemsortname>
+    </system>
     <system>
         <name>amiga</name>
         <systemsortname>1985</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index f6f439dd5..7bc617e58 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -22,6 +22,15 @@
         <platform>adam</platform>
         <theme>adam</theme>
     </system>
+    <system>
+        <name>ags</name>
+        <fullname>Adventure Game Studio Game Engine</fullname>
+        <path>%ROMPATH%/ags</path>
+        <extension>.app .sh</extension>
+        <command label="Shortcut or script">%STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>pcwindows</platform>
+        <theme>ags</theme>
+    </system>
     <system>
         <name>amiga</name>
         <fullname>Commodore Amiga</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index d786b4840..aed2db1e9 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -22,6 +22,15 @@
         <platform>adam</platform>
         <theme>adam</theme>
     </system>
+    <system>
+        <name>ags</name>
+        <fullname>Adventure Game Studio Game Engine</fullname>
+        <path>%ROMPATH%/ags</path>
+        <extension>.desktop .sh</extension>
+        <command label="Shortcut or script">%STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>pcwindows</platform>
+        <theme>ags</theme>
+    </system>
     <system>
         <name>amiga</name>
         <fullname>Commodore Amiga</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index ecd48c7f6..af6f37183 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -22,6 +22,15 @@
         <platform>adam</platform>
         <theme>adam</theme>
     </system>
+    <system>
+        <name>ags</name>
+        <fullname>Adventure Game Studio Game Engine</fullname>
+        <path>%ROMPATH%\ags</path>
+        <extension>.bat .BAT .lnk .LNK</extension>
+        <command label="Shortcut or script">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <platform>pcwindows</platform>
+        <theme>ags</theme>
+    </system>
     <system>
         <name>amiga</name>
         <fullname>Commodore Amiga</fullname>