diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 38dc0d0d2..1d96ed6f4 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -138,5 +138,6 @@ Emulators\WinArcadia\WinArcadia.exe
 Emulators\xemu\xemu.exe
 Emulators\xenia\xenia.exe
 Emulators\xenia_canary\xenia_canary.exe
+Emulators\XM6 Pro-68k\XM6.exe
 Emulators\xroar\xroar.exe
 Emulators\ZEsarUX\zesarux.exe
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 6553f6978..7251a4c5e 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -985,6 +985,16 @@
             <entry>%ESPATH%\..\Emulators\xenia_canary\xenia_canary.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XM6PRO68K">
+        <!-- Sharp X68000 emulator XM6 Pro-68k -->
+        <rule type="systempath">
+            <entry>XM6.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\XM6 Pro-68k\XM6.exe</entry>
+            <entry>%ESPATH%\..\Emulators\XM6 Pro-68k\XM6.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="XROAR">
         <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 9869a7026..d4f9c609c 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -660,6 +660,13 @@
             <entry>%ESPATH%\..\Emulators\xenia_canary\xenia_canary.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XM6PRO68K">
+        <!-- Sharp X68000 emulator XM6 Pro-68k -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\XM6 Pro-68k\XM6.exe</entry>
+            <entry>%ESPATH%\..\Emulators\XM6 Pro-68k\XM6.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="XROAR">
         <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index e7f077e80..ce9d9a3ab 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -2217,6 +2217,7 @@
         <extension>.2hd .2HD .88d .88D .cmd .CMD .d88 .D88 .dim .DIM .dup .DUP .hdf .HDF .hdm .HDM .img .IMG .m3u .M3U .xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\px68k_libretro.dll %ROM%</command>
         <command label="MAME (Standalone)">%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\x68000 x68000 -flop1 %ROM%</command>
+        <command label="XM6 Pro-68k (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XM6PRO68K% %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>