diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 099471ceb..184ac8e32 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -42,6 +42,7 @@ Preconfigured emulator locations:
 Emulators\RetroArch-Win64\retroarch.exe
 Emulators\RetroArch\retroarch.exe
 Emulators\3dSen\3dSen.exe
+Emulators\AdvanceMAME\advmame.exe
 Emulators\AppleWin\AppleWin.exe
 Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe
 Emulators\ares\ares.exe
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 6cbfd0cc5..90f3b1388 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -56,6 +56,18 @@
             <entry>~/bin/3dSen/wine*.AppImage</entry>
         </rule>
     </emulator>
+    <emulator name="ADVANCEMAME">
+        <!-- Arcade emulator AdvanceMAME -->
+        <rule type="systempath">
+            <entry>advmame</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/advancemame/advmame</entry>
+            <entry>~/.local/share/applications/advancemame/advmame</entry>
+            <entry>~/.local/bin/advancemame/advmame</entry>
+            <entry>~/bin/advancemame/advmame</entry>
+        </rule>
+    </emulator>
     <emulator name="ARES">
         <!-- Multi-system emulator ares -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 81541da55..0fbea8d7d 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -860,8 +860,8 @@
         <name>mame-advmame</name>
         <fullname>AdvanceMAME</fullname>
         <path>%ROMPATH%/mame-advmame</path>
-        <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="AdvanceMAME (Standalone)">%STARTDIR%=~/.advance %EMULATOR_ADVANCEMAME% %BASENAME%</command>
         <platform>arcade</platform>
         <theme>mame-advmame</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index b585ec269..3292ab133 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -52,6 +52,16 @@
             <entry>%ESPATH%\..\Emulators\3dSen\3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ADVANCEMAME">
+        <!-- Arcade emulator AdvanceMAME -->
+        <rule type="systempath">
+            <entry>advmame.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\AdvanceMAME\advmame.exe</entry>
+            <entry>%ESPATH%\..\Emulators\AdvanceMAME\advmame.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="APPLEWIN">
         <!-- Apple II emulator AppleWin -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 543eb9207..dc5fe37fe 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -28,6 +28,13 @@
             <entry>%ESPATH%\..\Emulators\3dSen\3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ADVANCEMAME">
+        <!-- Arcade emulator AdvanceMAME -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\AdvanceMAME\advmame.exe</entry>
+            <entry>%ESPATH%\..\Emulators\AdvanceMAME\advmame.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="APPLEWIN">
         <!-- Apple II emulator AppleWin -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 8788c3576..290458ef2 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -858,8 +858,8 @@
         <name>mame-advmame</name>
         <fullname>AdvanceMAME</fullname>
         <path>%ROMPATH%\mame-advmame</path>
-        <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="AdvanceMAME (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_ADVANCEMAME% %BASENAME%</command>
         <platform>arcade</platform>
         <theme>mame-advmame</theme>
     </system>