diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 8e2f559ab..3ed688c45 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -148,6 +148,7 @@ Emulators\xemu\xemu.exe
 Emulators\xenia\xenia.exe
 Emulators\xenia_canary\xenia_canary.exe
 Emulators\XM6 Pro-68k\XM6.exe
+Emulators\xm6_typeg\xm6g.exe
 Emulators\xroar\xroar.exe
 Emulators\yabasanshiro\yabasanshiro.exe
 Emulators\ZEsarUX\zesarux.exe
diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml
index 5db296888..815323a9a 100644
--- a/resources/systems/linux/es_find_rules.xml
+++ b/resources/systems/linux/es_find_rules.xml
@@ -1216,6 +1216,15 @@
             <entry>~/bin/XM6 Pro-68k/XM6.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XM6TYPEG-WINDOWS">
+        <!-- Sharp X68000 emulator XM6 TypeG -->
+        <rule type="staticpath">
+            <entry>~/Applications/xm6_typeg/xm6g.exe</entry>
+            <entry>~/.local/share/applications/xm6_typeg/xm6g.exe</entry>
+            <entry>~/.local/bin/xm6_typeg/xm6g.exe</entry>
+            <entry>~/bin/xm6_typeg/xm6g.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="XROAR">
         <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
         <rule type="systempath">
diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml
index b2a6f2066..81e526eaa 100644
--- a/resources/systems/linux/es_systems.xml
+++ b/resources/systems/linux/es_systems.xml
@@ -2290,6 +2290,8 @@
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/x68000 x68000 -flop1 %ROM%</command>
         <command label="XM6 Pro-68k (Wine)">%STARTDIR%=%GAMEDIR% %PRECOMMAND_WINE% %EMULATOR_XM6PRO68K-WINDOWS% "%FILENAME%"</command>
         <command label="XM6 Pro-68k (Proton)">%STARTDIR%=%GAMEDIR% %PRECOMMAND_PROTON% %EMULATOR_XM6PRO68K-WINDOWS% "%FILENAME%"</command>
+        <command label="XM6 TypeG (Wine)">%STARTDIR%=%GAMEDIR% %PRECOMMAND_WINE% %EMULATOR_XM6TYPEG-WINDOWS% "%FILENAME%"</command>
+        <command label="XM6 TypeG (Proton)">%STARTDIR%=%GAMEDIR% %PRECOMMAND_PROTON% %EMULATOR_XM6TYPEG-WINDOWS% "%FILENAME%"</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 15f0095b2..03e60f557 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -1091,6 +1091,16 @@
             <entry>%ESPATH%\..\Emulators\XM6 Pro-68k\XM6.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XM6TYPEG">
+        <!-- Sharp X68000 emulator XM6 TypeG -->
+        <rule type="systempath">
+            <entry>xm6g.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\xm6_typeg\xm6g.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xm6_typeg\xm6g.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 0c9bcfecf..6958c3e1f 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -734,6 +734,13 @@
             <entry>%ESPATH%\..\Emulators\XM6 Pro-68k\XM6.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XM6TYPEG">
+        <!-- Sharp X68000 emulator XM6 TypeG -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\xm6_typeg\xm6g.exe</entry>
+            <entry>%ESPATH%\..\Emulators\xm6_typeg\xm6g.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 291e39300..f5ee44687 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -2273,6 +2273,7 @@
         <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>
+        <command label="XM6 TypeG (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XM6TYPEG% %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>