diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 184ac8e32..4906a62d7 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -115,6 +115,8 @@ Emulators\tsugaru\Tsugaru_CUI.exe
 Emulators\VBA-M\visualboyadvance-m.exe
 Emulators\VICE\x64sc.exe
 Emulators\VICE\bin\x64sc.exe
+Emulators\VICE\xplus4.exe
+Emulators\VICE\bin\xplus4.exe
 Emulators\VICE\xvic.exe
 Emulators\VICE\bin\xvic.exe
 Emulators\Visual Pinball\VPinballX.exe
diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 5b90434c0..ebacc3e5b 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -106,6 +106,7 @@ namespace PlatformIds
         "pcfx",                 // NEC PC-FX
         "pcwindows",            // Microsoft Windows
         "pico8",                // PICO-8 Fantasy Console
+        "plus4",                // Commodore Plus/4
         "pokemini",             // Nintendo Pokémon Mini
         "ps2",                  // Sony PlayStation 2
         "ps3",                  // Sony PlayStation 3
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 8ab94c47c..c9224e917 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -105,6 +105,7 @@ namespace PlatformIds
         NEC_PCFX,
         MICROSOFT_WINDOWS,
         GAMEENGINE_PICO8,
+        COMMODORE_PLUS4,
         NINTENDO_POKEMON_MINI,
         SONY_PLAYSTATION_2,
         SONY_PLAYSTATION_3,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 772530597..8b016fdf1 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -39,8 +39,6 @@ namespace
 
     const std::map<PlatformId, std::string> gamesdb_new_platformid_map {
         {THREEDO, "25"},
-        {COMMODORE_AMIGA, "4911"},
-        {COMMODORE_AMIGA_CD32, "4947"},
         {AMSTRAD_CPC, "4914"},
         {APPLE_II, "4942"},
         {ARCADE, "23"},
@@ -63,6 +61,9 @@ namespace
         {CAVESTORY, "1"},
         {COLECOVISION, "31"},
         {COMMODORE_64, "40"},
+        {COMMODORE_AMIGA, "4911"},
+        {COMMODORE_AMIGA_CD32, "4947"},
+        {COMMODORE_PLUS4, "5007"},
         {COMMODORE_VIC20, "4945"},
         {CREATRONIC_MEGA_DUCK, "4948"},
         {DAPHNE, "23"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 3ab9b21a2..1eb5f40bd 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -29,8 +29,6 @@ namespace
     // https://www.screenscraper.fr/api/systemesListe.php?devid=xxx&devpassword=yyy&softname=zzz&output=XML
     const std::map<PlatformId, unsigned short> screenscraper_platformid_map {
         {THREEDO, 29},
-        {COMMODORE_AMIGA, 64},
-        {COMMODORE_AMIGA_CD32, 130},
         {AMSTRAD_CPC, 65},
         {AMSTRAD_GX4000, 87},
         {APPLE_II, 86},
@@ -57,7 +55,10 @@ namespace
         {VTECH_CREATIVISION, 241},
         {VTECH_VSMILE, 120},
         {COMMODORE_64, 66},
+        {COMMODORE_AMIGA, 64},
+        {COMMODORE_AMIGA_CD32, 130},
         {COMMODORE_CDTV, 129},
+        {COMMODORE_PLUS4, 99},
         {COMMODORE_VIC20, 73},
         {CREATRONIC_MEGA_DUCK, 90},
         {DAPHNE, 49},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 1317d2832..2632a808c 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -465,6 +465,10 @@
         <name>pico8</name>
         <systemsortname>Engine - 2015</systemsortname>
     </system>
+    <system>
+        <name>plus4</name>
+        <systemsortname>Computer - 1984</systemsortname>
+    </system>
     <system>
         <name>pokemini</name>
         <systemsortname>Portable - 2001</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index fa76786d6..b3c8ef2e0 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -465,6 +465,10 @@
         <name>pico8</name>
         <systemsortname>Lexaloffle - Engine - 2015</systemsortname>
     </system>
+    <system>
+        <name>plus4</name>
+        <systemsortname>Commodore - Computer - 1984</systemsortname>
+    </system>
     <system>
         <name>pokemini</name>
         <systemsortname>Nintendo - Portable - 2001</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index cb72e3838..a789cbd2f 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -465,6 +465,10 @@
         <name>pico8</name>
         <systemsortname>Lexaloffle - 2015</systemsortname>
     </system>
+    <system>
+        <name>plus4</name>
+        <systemsortname>Commodore - 1984</systemsortname>
+    </system>
     <system>
         <name>pokemini</name>
         <systemsortname>Nintendo - 2001</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index da836e151..5de1bfcf8 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -465,6 +465,10 @@
         <name>pico8</name>
         <systemsortname>2015</systemsortname>
     </system>
+    <system>
+        <name>plus4</name>
+        <systemsortname>1984</systemsortname>
+    </system>
     <system>
         <name>pokemini</name>
         <systemsortname>2001</systemsortname>
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 70f65b7c5..2c5e701c5 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -334,8 +334,15 @@
             <entry>/usr/local/bin/x64sc</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XPLUS4">
+        <!-- Commodore 8-bit computer emulator VICE (xplus4) -->
+        <rule type="staticpath">
+            <entry>/opt/homebrew/bin/xplus4</entry>
+            <entry>/usr/local/bin/xplus4</entry>
+        </rule>
+    </emulator>
     <emulator name="VICE-XVIC">
-        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <!-- Commodore 8-bit computer emulator VICE (xvic) -->
         <rule type="staticpath">
             <entry>/opt/homebrew/bin/xvic</entry>
             <entry>/usr/local/bin/xvic</entry>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 1b12ae8a5..da0879ac5 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1282,6 +1282,16 @@
         <platform>pico8</platform>
         <theme>pico8</theme>
     </system>
+    <system>
+        <name>plus4</name>
+        <fullname>Commodore Plus/4</fullname>
+        <path>%ROMPATH%/plus4</path>
+        <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
+        <command label="VICE xplus4">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xplus4_libretro.dylib %ROM%</command>
+        <command label="VICE xplus4 (Standalone)">%EMULATOR_VICE-XPLUS4% %ROM%</command>
+        <platform>plus4</platform>
+        <theme>plus4</theme>
+    </system>
     <system>
         <name>pokemini</name>
         <fullname>Nintendo Pokémon Mini</fullname>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 90f3b1388..ef94d7d6e 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -871,8 +871,19 @@
             <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XPLUS4">
+        <!-- Commodore 8-bit computer emulator VICE (xplus4) -->
+        <rule type="systempath">
+            <entry>xplus4</entry>
+            <entry>vice-jz.xplus4</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xplus4 net.sf.VICE</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xplus4 net.sf.VICE</entry>
+        </rule>
+    </emulator>
     <emulator name="VICE-XVIC">
-        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <!-- Commodore 8-bit computer emulator VICE (xvic) -->
         <rule type="systempath">
             <entry>xvic</entry>
             <entry>vice-jz.xvic</entry>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 8b070827b..168580d13 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1335,6 +1335,16 @@
         <platform>pico8</platform>
         <theme>pico8</theme>
     </system>
+    <system>
+        <name>plus4</name>
+        <fullname>Commodore Plus/4</fullname>
+        <path>%ROMPATH%/plus4</path>
+        <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
+        <command label="VICE xplus4">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xplus4_libretro.so %ROM%</command>
+        <command label="VICE xplus4 (Standalone)">%EMULATOR_VICE-XPLUS4% %ROM%</command>
+        <platform>plus4</platform>
+        <theme>plus4</theme>
+    </system>
     <system>
         <name>pokemini</name>
         <fullname>Nintendo Pokémon Mini</fullname>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 3292ab133..8befcb1b9 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -805,8 +805,20 @@
             <entry>%ESPATH%\..\Emulators\VICE\bin\x64sc.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XPLUS4">
+        <!-- Commodore 8-bit computer emulator VICE (xplus4) -->
+        <rule type="systempath">
+            <entry>xplus4.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\VICE\xplus4.exe</entry>
+            <entry>%ESPATH%\Emulators\VICE\bin\xplus4.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\xplus4.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\bin\xplus4.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VICE-XVIC">
-        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <!-- Commodore 8-bit computer emulator VICE (xvic) -->
         <rule type="systempath">
             <entry>xvic.exe</entry>
         </rule>
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index dc5fe37fe..aa7470a8e 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -534,8 +534,17 @@
             <entry>%ESPATH%\..\Emulators\VICE\bin\x64sc.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XPLUS4">
+        <!-- Commodore 8-bit computer emulator VICE (xplus4) -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\VICE\xplus4.exe</entry>
+            <entry>%ESPATH%\Emulators\VICE\bin\xplus4.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\xplus4.exe</entry>
+            <entry>%ESPATH%\..\Emulators\VICE\bin\xplus4.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VICE-XVIC">
-        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <!-- Commodore 8-bit computer emulator VICE (xvic) -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\VICE\xvic.exe</entry>
             <entry>%ESPATH%\Emulators\VICE\bin\xvic.exe</entry>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 9fc8fe9ea..7b6e16d69 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1330,6 +1330,16 @@
         <platform>pico8</platform>
         <theme>pico8</theme>
     </system>
+    <system>
+        <name>plus4</name>
+        <fullname>Commodore Plus/4</fullname>
+        <path>%ROMPATH%\plus4</path>
+        <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
+        <command label="VICE xplus4">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xplus4_libretro.dll %ROM%</command>
+        <command label="VICE xplus4 (Standalone)">%EMULATOR_VICE-XPLUS4% %ROM%</command>
+        <platform>plus4</platform>
+        <theme>plus4</theme>
+    </system>
     <system>
         <name>pokemini</name>
         <fullname>Nintendo Pokémon Mini</fullname>