diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index a46877493..9e8c31ee5 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -58,6 +58,7 @@ namespace PlatformIds
         "flash",                // Adobe Flash
         "fmtowns",              // Fujitsu FM Towns
         "gameandwatch",         // Nintendo Game and Watch
+        "gamecom",              // Tiger Electronics Game.com
         "gamegear",             // Sega Game Gear
         "gb",                   // Nintendo Game Boy
         "gba",                  // Nintendo Game Boy Advance
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 732300816..6ca0301e0 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -57,6 +57,7 @@ namespace PlatformIds
         ADOBE_FLASH,
         FUJITSU_FM_TOWNS,
         NINTENDO_GAME_AND_WATCH,
+        TIGER_GAME_COM,
         SEGA_GAME_GEAR,
         NINTENDO_GAME_BOY,
         NINTENDO_GAME_BOY_ADVANCE,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 2823a9412..5535084b5 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -135,6 +135,7 @@ namespace
         {BANDAI_WONDERSWAN_COLOR, "4926"},
         {SINCLAIR_ZX_SPECTRUM, "4913"},
         {SINCLAIR_ZX81_SINCLAR, "5010"},
+        {TIGER_GAME_COM, "4940"},
         {VIDEOPAC_ODYSSEY2, "4927"},
         {VECTREX, "4939"},
         {VTECH_CREATIVISION, "5005"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 51ebe07a2..7afe2d936 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -142,6 +142,7 @@ namespace
         {TANDY_TRS80, 144},
         {TANDY_COLOR_COMPUTER, 144},
         {TEXAS_INSTRUMENTS_TI99, 205},
+        {TIGER_GAME_COM, 121},
         {SEGA_NAOMI, 56},
         {THOMSON_MOTO, 141},
         {UZEBOX, 216},
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index ad3fee091..38ba3ca39 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -573,6 +573,15 @@
         <platform>gameandwatch</platform>
         <theme>gameandwatch</theme>
     </system>
+    <system>
+        <name>gamecom</name>
+        <fullname>Tiger Electronics Game.com</fullname>
+        <path>%ROMPATH%/gamecom</path>
+        <extension>.tgc .TGC .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM%</command>
+        <platform>gamecom</platform>
+        <theme>gamecom</theme>
+    </system>
     <system>
         <name>gamegear</name>
         <fullname>Sega Game Gear</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index af80af3d1..2c04006c8 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -589,6 +589,15 @@
         <platform>gameandwatch</platform>
         <theme>gameandwatch</theme>
     </system>
+    <system>
+        <name>gamecom</name>
+        <fullname>Tiger Electronics Game.com</fullname>
+        <path>%ROMPATH%/gamecom</path>
+        <extension>.tgc .TGC .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM%</command>
+        <platform>gamecom</platform>
+        <theme>gamecom</theme>
+    </system>
     <system>
         <name>gamegear</name>
         <fullname>Sega Game Gear</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 197f0b71c..13bae0cbe 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -590,6 +590,15 @@
         <platform>gameandwatch</platform>
         <theme>gameandwatch</theme>
     </system>
+    <system>
+        <name>gamecom</name>
+        <fullname>Tiger Electronics Game.com</fullname>
+        <path>%ROMPATH%\gamecom</path>
+        <extension>.tgc .TGC .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\gamecom gamecom -cartridge1 %ROM%</command>
+        <platform>gamecom</platform>
+        <theme>gamecom</theme>
+    </system>
     <system>
         <name>gamegear</name>
         <fullname>Sega Game Gear</fullname>