diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index d71a21856..c9a6a3e9b 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -47,6 +47,7 @@ Emulators\fbneo\fbneo64.exe
 Emulators\fbneo\fbneo.exe
 Emulators\flycast\flycast.exe
 Emulators\Gearboy\Gearboy.exe
+Emulators\hatari\hatari.exe
 Emulators\Hypseus Singe\hypseus.exe
 Emulators\KEmulator\KEmulator.exe
 Emulators\m2emulator\EMULATOR.EXE
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 7df18586c..7db4ca2c7 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -117,6 +117,14 @@
             <entry>/usr/local/bin/fs-uae</entry>
         </rule>
     </emulator>
+    <emulator name="HATARI">
+        <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
+        <rule type="staticpath">
+            <entry>/Applications/Hatari.app/Contents/MacOS/hatari</entry>
+            <entry>/opt/homebrew/bin/hatari</entry>
+            <entry>/usr/local/bin/hatari</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="systempath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 7923f7a82..000cee824 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -201,7 +201,8 @@
         <fullname>Atari ST</fullname>
         <path>%ROMPATH%/atarist</path>
         <extension>.st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.dylib %ROM%</command>
+        <command label="Hatari">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.dylib %ROM%</command>
+        <command label="Hatari (Standalone)">%EMULATOR_HATARI% %ROM%</command>
         <platform>atarist</platform>
         <theme>atarist</theme>
     </system>
@@ -1123,7 +1124,7 @@
         <path>%ROMPATH%/ports</path>
         <extension>.app .sh</extension>
         <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
-        <platform>pc</platform>
+        <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
     <system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 37df7f2a1..72cf508d1 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -254,6 +254,16 @@
             <entry>~/bin/gearboy/gearboy</entry>
         </rule>
     </emulator>
+    <emulator name="HATARI">
+        <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
+        <rule type="systempath">
+            <entry>hatari</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.tuxfamily.hatari</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.tuxfamily.hatari</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index d9ab8b558..a6f119790 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -206,7 +206,8 @@
         <fullname>Atari ST</fullname>
         <path>%ROMPATH%/atarist</path>
         <extension>.st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM%</command>
+        <command label="Hatari">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM%</command>
+        <command label="Hatari (Standalone)">%EMULATOR_HATARI% %ROM%</command>
         <platform>atarist</platform>
         <theme>atarist</theme>
     </system>
@@ -1159,7 +1160,7 @@
         <path>%ROMPATH%/ports</path>
         <extension>.desktop .sh</extension>
         <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
-        <platform>pc</platform>
+        <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
     <system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 4d38b8881..76fadf627 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -283,6 +283,17 @@
             <entry>%ESPATH%\..\Gearboy\Gearboy.exe</entry>
         </rule>
     </emulator>
+    <emulator name="HATARI">
+        <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
+        <rule type="systempath">
+            <entry>hatari.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\hatari\hatari.exe</entry>
+            <entry>%ESPATH%\hatari\hatari.exe</entry>
+            <entry>%ESPATH%\..\hatari\hatari.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index b8fd6d6b7..110f469f8 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -192,6 +192,14 @@
             <entry>%ESPATH%\..\Gearboy\Gearboy.exe</entry>
         </rule>
     </emulator>
+    <emulator name="HATARI">
+        <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\hatari\hatari.exe</entry>
+            <entry>%ESPATH%\hatari\hatari.exe</entry>
+            <entry>%ESPATH%\..\hatari\hatari.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index b91bd655a..6bb2a6f05 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -209,7 +209,8 @@
         <fullname>Atari ST</fullname>
         <path>%ROMPATH%\atarist</path>
         <extension>.st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\hatari_libretro.dll %ROM%</command>
+        <command label="Hatari">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\hatari_libretro.dll %ROM%</command>
+        <command label="Hatari (Standalone)">%EMULATOR_HATARI% %ROM%</command>
         <platform>atarist</platform>
         <theme>atarist</theme>
     </system>
@@ -1160,7 +1161,7 @@
         <path>%ROMPATH%\ports</path>
         <extension>.bat .BAT .lnk .LNK</extension>
         <command>%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
-        <platform>pc</platform>
+        <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
     <system>