diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index ebacc3e5b..d7c767f0d 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -59,6 +59,7 @@ namespace PlatformIds
         "flash",                // Adobe Flash
         "fmtowns",              // Fujitsu FM Towns
         "fpinball",             // Future Pinball
+        "gamate",               // Bit Corporation Gamate
         "gameandwatch",         // Nintendo Game and Watch
         "gamecom",              // Tiger Electronics Game.com
         "gamegear",             // Sega Game Gear
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index c9224e917..da9880da7 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -58,6 +58,7 @@ namespace PlatformIds
         ADOBE_FLASH,
         FUJITSU_FM_TOWNS,
         FUTURE_PINBALL,
+        BIT_CORPORATION_GAMATE,
         NINTENDO_GAME_AND_WATCH,
         TIGER_GAME_COM,
         SEGA_GAME_GEAR,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 8b016fdf1..b80491d50 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -57,6 +57,7 @@ namespace
         {ATARI_ST, "4937"},
         {ATARI_XE, "30"},
         {BBC_MICRO, "5013"},
+        {BIT_CORPORATION_GAMATE, "5004"},
         {CASIO_PV1000, "4964"},
         {CAVESTORY, "1"},
         {COLECOVISION, "31"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 1eb5f40bd..e90cc1013 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -49,6 +49,7 @@ namespace
         {ATARI_XE, 43},
         {ATOMISWAVE, 53},
         {BBC_MICRO, 37},
+        {BIT_CORPORATION_GAMATE, 266},
         {CASIO_PV1000, 74},
         {CAVESTORY, 135},
         {COLECOVISION, 48},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 2632a808c..890b062b9 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>fpinball</name>
         <systemsortname>Engine - 2005</systemsortname>
     </system>
+    <system>
+        <name>gamate</name>
+        <systemsortname>Portable - 1990</systemsortname>
+    </system>
     <system>
         <name>gameandwatch</name>
         <systemsortname>Portable - 1980</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index b3c8ef2e0..54e08c80d 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>fpinball</name>
         <systemsortname>Christopher Leathley - Engine - 2005</systemsortname>
     </system>
+    <system>
+        <name>gamate</name>
+        <systemsortname>Bit Corporation - Portable - 1990</systemsortname>
+    </system>
     <system>
         <name>gameandwatch</name>
         <systemsortname>Nintendo - Portable - 1980</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index a789cbd2f..f6f4c1936 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>fpinball</name>
         <systemsortname>Christopher Leathley - 2005</systemsortname>
     </system>
+    <system>
+        <name>gamate</name>
+        <systemsortname>Bit Corporation - 1990</systemsortname>
+    </system>
     <system>
         <name>gameandwatch</name>
         <systemsortname>Nintendo - 1980</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index 5de1bfcf8..d9d2c8c6b 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -221,6 +221,10 @@
         <name>fpinball</name>
         <systemsortname>2005</systemsortname>
     </system>
+    <system>
+        <name>gamate</name>
+        <systemsortname>1990</systemsortname>
+    </system>
     <system>
         <name>gameandwatch</name>
         <systemsortname>1980</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index da0879ac5..c12fce004 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -599,6 +599,15 @@
         <platform>fpinball</platform>
         <theme>fpinball</theme>
     </system>
+    <system>
+        <name>gamate</name>
+        <fullname>Bit Corporation Gamate</fullname>
+        <path>%ROMPATH%/gamate</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamate gamate -cart %ROM%</command>
+        <platform>gamate</platform>
+        <theme>gamate</theme>
+    </system>
     <system>
         <name>gameandwatch</name>
         <fullname>Nintendo Game and Watch</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 168580d13..dcccb5670 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -624,6 +624,15 @@
         <platform>fpinball</platform>
         <theme>fpinball</theme>
     </system>
+    <system>
+        <name>gamate</name>
+        <fullname>Bit Corporation Gamate</fullname>
+        <path>%ROMPATH%/gamate</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamate gamate -cart %ROM%</command>
+        <platform>gamate</platform>
+        <theme>gamate</theme>
+    </system>
     <system>
         <name>gameandwatch</name>
         <fullname>Nintendo Game and Watch</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 7b6e16d69..06c2cea56 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -620,6 +620,15 @@
         <platform>fpinball</platform>
         <theme>fpinball</theme>
     </system>
+    <system>
+        <name>gamate</name>
+        <fullname>Bit Corporation Gamate</fullname>
+        <path>%ROMPATH%\gamate</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\gamate gamate -cart %ROM%</command>
+        <platform>gamate</platform>
+        <theme>gamate</theme>
+    </system>
     <system>
         <name>gameandwatch</name>
         <fullname>Nintendo Game and Watch</fullname>