diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index ba8d2d39e..adcdaa592 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -144,4 +144,5 @@ Emulators\xenia\xenia.exe
Emulators\xenia_canary\xenia_canary.exe
Emulators\XM6 Pro-68k\XM6.exe
Emulators\xroar\xroar.exe
+Emulators\yabasanshiro\yabasanshiro.exe
Emulators\ZEsarUX\zesarux.exe
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 7ffe0f360..9896d0f36 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -1051,6 +1051,16 @@
%ESPATH%\..\Emulators\xroar\xroar.exe
+
+
+
+ yabasanshiro.exe
+
+
+ %ESPATH%\Emulators\yabasanshiro\yabasanshiro.exe
+ %ESPATH%\..\Emulators\yabasanshiro\yabasanshiro.exe
+
+
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index c819f18b6..6a0b69b51 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -706,6 +706,13 @@
%ESPATH%\..\Emulators\xroar\xroar.exe
+
+
+
+ %ESPATH%\Emulators\yabasanshiro\yabasanshiro.exe
+ %ESPATH%\..\Emulators\yabasanshiro\yabasanshiro.exe
+
+
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index bccf539b8..744d8c726 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1689,6 +1689,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_saturn_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\kronos_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\yabasanshiro_libretro.dll %ROM%
+ %EMULATOR_YABASANSHIRO-2% -a -i %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\yabause_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module ss %ROM%
%EMULATOR_SSF% %ROM%
@@ -1703,6 +1704,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_saturn_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\kronos_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\yabasanshiro_libretro.dll %ROM%
+ %EMULATOR_YABASANSHIRO-2% -a -i %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\yabause_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module ss %ROM%
%EMULATOR_SSF% %ROM%