diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 8e4832c07..5b90434c0 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -27,6 +27,7 @@ namespace PlatformIds
"apple2gs", // Apple IIGS
"arcade", // Arcade
"arcadia", // Emerson Arcadia 2001
+ "archimedes", // Acorn Archimedes
"arduboy", // Arduboy Miniature Game System
"astrocde", // Bally Astrocade
"atari2600", // Atari 2600
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index ac6e9f951..8ab94c47c 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -26,6 +26,7 @@ namespace PlatformIds
APPLE_IIGS,
ARCADE,
ARCADIA_2001,
+ ACORN_ARCHIMEDES,
ARDUBOY,
BALLY_ASTROCADE,
ATARI_2600,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index caa9f2fde..772530597 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -47,6 +47,7 @@ namespace
{ATOMISWAVE, "23"},
{SEGA_NAOMI, "23"},
{ARCADIA_2001, "4963"},
+ {ACORN_ARCHIMEDES, "4944"},
{BALLY_ASTROCADE, "4968"},
{ATARI_800, "4943"},
{ATARI_2600, "22"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 00eaace07..3ab9b21a2 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -37,6 +37,7 @@ namespace
{APPLE_IIGS, 217},
{ARCADE, 75},
{ARCADIA_2001, 94},
+ {ACORN_ARCHIMEDES, 84},
{ARDUBOY, 263},
{BALLY_ASTROCADE, 44},
{ATARI_800, 43},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index ab0cf662f..1317d2832 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -49,6 +49,10 @@
arcadia
Console - 1982
+
+ archimedes
+ Computer - 1987
+
arduboy
Portable - 2015
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index 963ff14ab..fa76786d6 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -49,6 +49,10 @@
arcadia
Emerson - Console - 1982
+
+ archimedes
+ Acorn Computers - Computer - 1987
+
arduboy
Kevin Bates - Portable - 2015
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index 8a7511061..cb72e3838 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -49,6 +49,10 @@
arcadia
Emerson - 1982
+
+ archimedes
+ Acorn Computers - 1987
+
arduboy
Kevin Bates - 2015
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index a493544ff..da836e151 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -49,6 +49,10 @@
arcadia
1982
+
+ archimedes
+ 1987
+
arduboy
2015
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 26d08301d..1b12ae8a5 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -126,6 +126,18 @@
arcadia
arcadia
+
+ archimedes
+ Acorn Archimedes
+ %ROMPATH%/archimedes
+ .1dd .1DD .360 .adf .ADF .adl .ADL .adm .ADM .ads .ADS .apd .APD .bbc .BBC .chd .CHD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .ima .IMA .imd .IMD .img .IMG .ipf .IPF .jfd .JFD .mfi .MFI .mfm .MFM .msa .MSA .ssd .SSD .st .ST .td0 .TD0 .ufi .UFI .7z .7Z .zip .ZIP
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa4401 -flop1 %ROM%
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa3000 -flop1 %ROM%
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa310 -flop1 %ROM%
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa540 -flop1 %ROM%
+ archimedes
+ archimedes
+
arduboy
Arduboy Miniature Game System
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 8b466dd44..8b070827b 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -131,6 +131,18 @@
arcadia
arcadia
+
+ archimedes
+ Acorn Archimedes
+ %ROMPATH%/archimedes
+ .1dd .1DD .360 .adf .ADF .adl .ADL .adm .ADM .ads .ADS .apd .APD .bbc .BBC .chd .CHD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .ima .IMA .imd .IMD .img .IMG .ipf .IPF .jfd .JFD .mfi .MFI .mfm .MFM .msa .MSA .ssd .SSD .st .ST .td0 .TD0 .ufi .UFI .7z .7Z .zip .ZIP
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa4401 -flop1 %ROM%
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa3000 -flop1 %ROM%
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa310 -flop1 %ROM%
+ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa540 -flop1 %ROM%
+ archimedes
+ archimedes
+
arduboy
Arduboy Miniature Game System
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 5d9c148a0..9fc8fe9ea 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -133,6 +133,18 @@
arcadia
arcadia
+
+ archimedes
+ Acorn Archimedes
+ %ROMPATH%\archimedes
+ .1dd .1DD .360 .adf .ADF .adl .ADL .adm .ADM .ads .ADS .apd .APD .bbc .BBC .chd .CHD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .ima .IMA .imd .IMD .img .IMG .ipf .IPF .jfd .JFD .mfi .MFI .mfm .MFM .msa .MSA .ssd .SSD .st .ST .td0 .TD0 .ufi .UFI .7z .7Z .zip .ZIP
+ %HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\archimedes aa4401 -flop1 %ROM%
+ %HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\archimedes aa3000 -flop1 %ROM%
+ %HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\archimedes aa310 -flop1 %ROM%
+ %HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\archimedes aa540 -flop1 %ROM%
+ archimedes
+ archimedes
+
arduboy
Arduboy Miniature Game System