diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 4a4234667..5a82d626b 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -2,7 +2,7 @@ EmulationStation Desktop Edition (ES-DE) - Portable installation on Windows
---------------------------------------------------------------------------
ES-DE release:
-1.2.5
+1.2.6
Instructions:
@@ -50,6 +50,7 @@ Emulators\PPSSPP\PPSSPPWindows64.exe
Emulators\redream\redream.exe
Emulators\RPCS3\rpcs3.exe
Emulators\ryujinx\Ryujinx.exe
+Emulators\scummvm\scummvm.exe
Emulators\snes9x\snes9x-x64.exe
Emulators\Supermodel\Supermodel.exe
Emulators\VBA-M\visualboyadvance-m.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 5abd93478..4d2f49331 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -162,6 +162,14 @@
/Applications/RPCS3.app/Contents/MacOS/rpcs3
+
+
+
+ /Applications/ScummVM.app/Contents/MacOS/scummvm
+ /opt/homebrew/bin/scummvm
+ /usr/local/bin/scummvm
+
+
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index f62e1f70a..6edc215a6 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1130,7 +1130,8 @@
ScummVM Game Engine
%ROMPATH%/scummvm
.scummvm .SCUMMVM .svm .SVM
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.dylib %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.dylib %ROM%
+ %STARTDIR%=%GAMEDIR% %EMULATOR_SCUMMVM% %BASENAME%
scummvm
scummvm
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 0f361b105..820683507 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -337,6 +337,17 @@
~/bin/rpcs3*.AppImage
+
+
+
+ scummvm
+ org.scummvm.ScummVM
+
+
+ /var/lib/flatpak/exports/bin/org.scummvm.ScummVM
+ ~/.local/share/flatpak/exports/bin/org.scummvm.ScummVM
+
+
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 74b450e63..1594b53b3 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1147,7 +1147,8 @@
ScummVM Game Engine
%ROMPATH%/scummvm
.scummvm .SCUMMVM .svm .SVM
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM%
+ %STARTDIR%=%GAMEDIR% %EMULATOR_SCUMMVM% %BASENAME%
scummvm
scummvm
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 735d5f68a..bf729419b 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -363,6 +363,20 @@
%ESPATH%\..\ryujinx\Ryujinx.exe
+
+
+
+ SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\ScummVM_is1\InstallLocation|scummvm.exe
+
+
+ scummvm.exe
+
+
+ %ESPATH%\Emulators\scummvm\scummvm.exe
+ %ESPATH%\scummvm\scummvm.exe
+ %ESPATH%\..\scummvm\scummvm.exe
+
+
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 9a3e88ea2..f04153aef 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -237,6 +237,14 @@
%ESPATH%\..\ryujinx\Ryujinx.exe
+
+
+
+ %ESPATH%\Emulators\scummvm\scummvm.exe
+ %ESPATH%\scummvm\scummvm.exe
+ %ESPATH%\..\scummvm\scummvm.exe
+
+
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 648141713..ac36a4287 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1145,7 +1145,8 @@
ScummVM Game Engine
%ROMPATH%\scummvm
.scummvm .SCUMMVM .svm .SVM
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\scummvm_libretro.dll %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\scummvm_libretro.dll %ROM%
+ %STARTDIR%=%GAMEDIR% %EMULATOR_SCUMMVM% %BASENAME%
scummvm
scummvm