diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 85cbf2922..3df156bdd 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -58,6 +58,7 @@ Emulators\ryujinx\Ryujinx.exe
 Emulators\scummvm\scummvm.exe
 Emulators\SheepShaver\SheepShaver.exe
 Emulators\snes9x\snes9x-x64.exe
+Emulators\solarus\solarus-run.exe
 Emulators\Supermodel\Supermodel.exe
 Emulators\VBA-M\visualboyadvance-m.exe
 Emulators\Vita3K\Vita3K.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index a694ba58e..ca2a0a8e0 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -201,6 +201,13 @@
             <entry>/Applications/Snes9x.app/Contents/MacOS/Snes9x</entry>
         </rule>
     </emulator>
+    <emulator name="SOLARUS">
+        <!-- Solarus game engine -->
+        <rule type="staticpath">
+            <entry>/opt/homebrew/bin/solarus-run</entry>
+            <entry>/usr/local/bin/solarus-run</entry>
+        </rule>
+    </emulator>
     <emulator name="STEAM">
         <!-- Valve Steam -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 87dcf8025..d084f6141 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1271,8 +1271,8 @@
         <name>solarus</name>
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.solarus</extension>
+        <command>%EMULATOR_SOLARUS% %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 48a4621c9..b807d4deb 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -402,6 +402,13 @@
             <entry>~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x</entry>
         </rule>
     </emulator>
+    <emulator name="SOLARUS">
+        <!-- Solarus game engine -->
+        <rule type="systempath">
+            <entry>solarus-run</entry>
+            <entry>solarus.run</entry>
+        </rule>
+    </emulator>
     <emulator name="STEAM">
         <!-- Valve Steam -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index a8f977987..b416eb7cd 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1295,8 +1295,8 @@
         <name>solarus</name>
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.solarus</extension>
+        <command>%EMULATOR_SOLARUS% %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 67f7ab10e..bc350e48b 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -454,6 +454,17 @@
             <entry>%ESPATH%\..\snes9x\snes9x-x64.exe</entry>
         </rule>
     </emulator>
+    <emulator name="SOLARUS">
+        <!-- Solarus game engine -->
+        <rule type="systempath">
+            <entry>solarus-run.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\solarus\solarus-run.exe</entry>
+            <entry>%ESPATH%\solarus\solarus-run.exe</entry>
+            <entry>%ESPATH%\..\solarus\solarus-run.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="STEAM">
         <!-- Valve Steam -->
         <rule type="winregistryvalue">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 9c6db792e..8085e3860 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -304,6 +304,14 @@
             <entry>%ESPATH%\..\snes9x\snes9x-x64.exe</entry>
         </rule>
     </emulator>
+    <emulator name="SOLARUS">
+        <!-- Solarus game engine -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\solarus\solarus-run.exe</entry>
+            <entry>%ESPATH%\solarus\solarus-run.exe</entry>
+            <entry>%ESPATH%\..\solarus\solarus-run.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="STEAM">
         <!-- Valve Steam -->
         <rule type="winregistryvalue">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index d1f7b12e2..694f2679f 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1294,8 +1294,8 @@
         <name>solarus</name>
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%\solarus</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.solarus</extension>
+        <command>%STARTDIR%=%EMUDIR% %EMULATOR_SOLARUS% %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>