diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index a113c78bc..83efd1bb3 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -14,6 +14,13 @@
             <entry>/Applications/RetroArch.app/Contents/Resources/cores</entry>
         </rule>
     </core>
+    <emulator name="ATARI800">
+        <!-- Atari 8-bit computer emulator Atari800 -->
+        <rule type="staticpath">
+            <entry>/opt/homebrew/bin/atari800</entry>
+            <entry>/usr/local/bin/atari800</entry>
+        </rule>
+    </emulator>
     <emulator name="CITRA">
         <!-- Nintendo 3DS emulator Citra -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 3c2e543ed..5aa2498b8 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -164,7 +164,8 @@
         <fullname>Atari 800</fullname>
         <path>%ROMPATH%/atari800</path>
         <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.dylib %ROM%</command>
+        <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.dylib %ROM%</command>
+        <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command>
         <platform>atari800</platform>
         <theme>atari800</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 0bf4ec5b6..ba958f176 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -35,6 +35,13 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="ATARI800">
+        <!-- Atari 8-bit computer emulator Atari800 -->
+        <rule type="systempath">
+            <entry>atari800</entry>
+            <entry>atari800-jz.atari800</entry>
+        </rule>
+    </emulator>
     <emulator name="BLASTEM">
         <!-- Sega Mega Drive/Genesis emulator BlastEm -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index e57d32d4f..2604119c3 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -165,7 +165,8 @@
         <fullname>Atari 800</fullname>
         <path>%ROMPATH%/atari800</path>
         <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
+        <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
+        <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command>
         <platform>atari800</platform>
         <theme>atari800</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 1f5bf3fef..ff6a02888 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -38,6 +38,17 @@
             <entry>%EMUPATH%\cores</entry>
         </rule>
     </core>
+    <emulator name="ATARI800">
+        <!-- Atari 8-bit computer emulator Atari800 -->
+        <rule type="systempath">
+            <entry>atari800.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\atari800\atari800.exe</entry>
+            <entry>%ESPATH%\Emulators\atari800\atari800.exe</entry>
+            <entry>%ESPATH%\..\atari800\atari800.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="CEMU">
         <!-- Nintendo Wii U emulator Cemu -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index eb4c833fe..3e1c06bd5 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -17,6 +17,14 @@
             <entry>%EMUPATH%\cores</entry>
         </rule>
     </core>
+    <emulator name="ATARI800">
+        <!-- Atari 8-bit computer emulator Atari800 -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\atari800\atari800.exe</entry>
+            <entry>%ESPATH%\Emulators\atari800\atari800.exe</entry>
+            <entry>%ESPATH%\..\atari800\atari800.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="CEMU">
         <!-- Nintendo Wii U emulator Cemu -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index e8bf303af..2b21ed7f1 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -165,7 +165,8 @@
         <fullname>Atari 800</fullname>
         <path>%ROMPATH%\atari800</path>
         <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\atari800_libretro.dll %ROM%</command>
+        <command label="Atari800">%EMULATOR_RETROARCH% %STARTDIR%=%EMUDIR% -L %CORE_RETROARCH%\atari800_libretro.dll %ROM%</command>
+        <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %STARTDIR%=%EMUDIR% %ROM%</command>
         <platform>atari800</platform>
         <theme>atari800</theme>
     </system>