diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 0a65b6fd5..26a9dffd9 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -59,6 +59,7 @@ namespace PlatformIds
         "famicom",              // Nintendo Family Computer
         "fds",                  // Nintendo Famicom Disk System
         "flash",                // Adobe Flash
+        "fm7",                  // Fujitsu FM-7
         "fmtowns",              // Fujitsu FM Towns
         "fpinball",             // Future Pinball
         "gamate",               // Bit Corporation Gamate
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 325d49b32..a39aaf938 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -58,6 +58,7 @@ namespace PlatformIds
         NINTENDO_FAMICOM,
         NINTENDO_FAMICOM_DISK_SYSTEM,
         ADOBE_FLASH,
+        FUJITSU_FM_7,
         FUJITSU_FM_TOWNS,
         FUTURE_PINBALL,
         BIT_CORPORATION_GAMATE,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 66a53f4aa..a30fe18d5 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -69,6 +69,7 @@ namespace
         {COMMODORE_VIC20, "4945"},
         {CREATRONIC_MEGA_DUCK, "4948"},
         {DAPHNE, "23"},
+        {FUJITSU_FM_7, "4978"},
         {FUJITSU_FM_TOWNS, "4932"},
         {INTELLIVISION, "32"},
         {APPLE_MACINTOSH, "37"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index dac233507..206def875 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -66,6 +66,7 @@ namespace
         {CREATRONIC_MEGA_DUCK, 90},
         {DAPHNE, 49},
         {EPOCH_SCV, 67},
+        {FUJITSU_FM_7, 97},
         {FUJITSU_FM_TOWNS, 253},
         {FUNTECH_SUPER_ACAN, 100},
         {INTELLIVISION, 115},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 4cd82ecf5..e0c43dc8f 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>flash</name>
         <systemsortname>Engine - 1996</systemsortname>
     </system>
+    <system>
+        <name>fm7</name>
+        <systemsortname>Computer - 1982</systemsortname>
+    </system>
     <system>
         <name>fmtowns</name>
         <systemsortname>Console - 1993</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index 28773d978..7b56ee8f8 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>flash</name>
         <systemsortname>Adobe - Engine - 1996</systemsortname>
     </system>
+    <system>
+        <name>fm7</name>
+        <systemsortname>Fujitsu - Computer - 1982</systemsortname>
+    </system>
     <system>
         <name>fmtowns</name>
         <systemsortname>Fujitsu - Console - 1993</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index c53f13e74..2cc9970e4 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>flash</name>
         <systemsortname>Adobe - 1996</systemsortname>
     </system>
+    <system>
+        <name>fm7</name>
+        <systemsortname>Fujitsu - 1982</systemsortname>
+    </system>
     <system>
         <name>fmtowns</name>
         <systemsortname>Fujitsu - 1993</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index 9b054e948..d14bb241d 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>flash</name>
         <systemsortname>1996</systemsortname>
     </system>
+    <system>
+        <name>fm7</name>
+        <systemsortname>1982</systemsortname>
+    </system>
     <system>
         <name>fmtowns</name>
         <systemsortname>1993</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 8ec275d93..5b444f6d4 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -608,6 +608,20 @@
         <platform>flash</platform>
         <theme>flash</theme>
     </system>
+    <system>
+        <name>fm7</name>
+        <fullname>Fujitsu FM-7</fullname>
+        <path>%ROMPATH%/fm7</path>
+        <extension>.1dd .1DD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsk .DSK .hfe .HFE .imd .IMD .mfi .MFI .mfm .MFM .t77 .T77 .td0 .TD0 .wav .WAV .7z .7Z .zip .ZIP</extension>
+        <command label="MAME [FM-7 Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 -flop1 %ROM%</command>
+        <command label="MAME [FM-7 Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
+        <command label="MAME [FM-7 Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 %BASENAME%</command>
+        <command label="MAME [FM77AV Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av -flop1 %ROM%</command>
+        <command label="MAME [FM77AV Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
+        <command label="MAME [FM77AV Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av %BASENAME%</command>
+        <platform>fm7</platform>
+        <theme>fm7</theme>
+    </system>
     <system>
         <name>fmtowns</name>
         <fullname>Fujitsu FM Towns</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 7da5596fe..dd0900f29 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -636,6 +636,20 @@
         <platform>flash</platform>
         <theme>flash</theme>
     </system>
+    <system>
+        <name>fm7</name>
+        <fullname>Fujitsu FM-7</fullname>
+        <path>%ROMPATH%/fm7</path>
+        <extension>.1dd .1DD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsk .DSK .hfe .HFE .imd .IMD .mfi .MFI .mfm .MFM .t77 .T77 .td0 .TD0 .wav .WAV .7z .7Z .zip .ZIP</extension>
+        <command label="MAME [FM-7 Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 -flop1 %ROM%</command>
+        <command label="MAME [FM-7 Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
+        <command label="MAME [FM-7 Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 %BASENAME%</command>
+        <command label="MAME [FM77AV Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av -flop1 %ROM%</command>
+        <command label="MAME [FM77AV Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
+        <command label="MAME [FM77AV Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av %BASENAME%</command>
+        <platform>fm7</platform>
+        <theme>fm7</theme>
+    </system>
     <system>
         <name>fmtowns</name>
         <fullname>Fujitsu FM Towns</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 78e5cd16c..82b6c04a1 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -629,6 +629,20 @@
         <platform>flash</platform>
         <theme>flash</theme>
     </system>
+    <system>
+        <name>fm7</name>
+        <fullname>Fujitsu FM-7</fullname>
+        <path>%ROMPATH%\fm7</path>
+        <extension>.1dd .1DD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsk .DSK .hfe .HFE .imd .IMD .mfi .MFI .mfm .MFM .t77 .T77 .td0 .TD0 .wav .WAV .7z .7Z .zip .ZIP</extension>
+        <command label="MAME [FM-7 Diskette] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\fm7 fm7 -flop1 %ROM%</command>
+        <command label="MAME [FM-7 Tape] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\fm7 fm7 -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
+        <command label="MAME [FM-7 Software list] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\fm7 fm7 %BASENAME%</command>
+        <command label="MAME [FM77AV Diskette] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\fm7 fm77av -flop1 %ROM%</command>
+        <command label="MAME [FM77AV Tape] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\fm7 fm77av -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
+        <command label="MAME [FM77AV Software list] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\fm7 fm77av %BASENAME%</command>
+        <platform>fm7</platform>
+        <theme>fm7</theme>
+    </system>
     <system>
         <name>fmtowns</name>
         <fullname>Fujitsu FM Towns</fullname>