diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index adcdaa592..097c5fd71 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -51,6 +51,7 @@ Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe
 Emulators\ares\ares.exe
 Emulators\atari800\atari800.exe
 Emulators\BasiliskII\BasiliskII.exe
+Emulators\BeebEm\BeebEm.exe
 Emulators\BigPEmu\BigPEmu.exe
 Emulators\bsnes\bsnes.exe
 Emulators\cemu\Cemu.exe
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 9896d0f36..576d3817e 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -135,6 +135,16 @@
             <entry>%ESPATH%\..\Emulators\BasiliskII\BasiliskII.exe</entry>
         </rule>
     </emulator>
+    <emulator name="BEEBEM">
+        <!-- Acorn Computers BBC Micro emulator BeebEm -->
+        <rule type="systempath">
+            <entry>BeebEm.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\BeebEm\BeebEm.exe</entry>
+            <entry>%ESPATH%\..\Emulators\BeebEm\BeebEm.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="BIGPEMU">
         <!-- Atari Jaguar emulator BigPEmu -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 6a0b69b51..47bf3eb4b 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -86,6 +86,13 @@
             <entry>%ESPATH%\..\Emulators\BasiliskII\BasiliskII.exe</entry>
         </rule>
     </emulator>
+    <emulator name="BEEBEM">
+        <!-- Acorn Computers BBC Micro emulator BeebEm -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\BeebEm\BeebEm.exe</entry>
+            <entry>%ESPATH%\..\Emulators\BeebEm\BeebEm.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="BIGPEMU">
         <!-- Atari Jaguar emulator BigPEmu -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 744d8c726..367a0a4e5 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -326,6 +326,7 @@
         <path>%ROMPATH%\bbcmicro</path>
         <extension>.dsd .DSD .img .IMG .ssd .SSD .7z .7Z .zip .ZIP</extension>
         <command label="MAME (Standalone)">%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\bbcmicro bbcb -autoboot_delay "2" -autoboot_command "*cat\n\n*exec !boot\n" -analogue acornjoy -flop1 %ROM%</command>
+        <command label="BeebEm (Standalone)">%EMULATOR_BEEBEM% %INJECT%=%BASENAME%.commands -FullScreen %ROM%</command>
         <platform>bbcmicro</platform>
         <theme>bbcmicro</theme>
     </system>