diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 74c23c012..9dc6df86b 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -65,6 +65,7 @@ namespace PlatformIds
         "gbc",                  // Nintendo Game Boy Color
         "gc",                   // Nintendo GameCube
         "genesis",              // Sega Genesis
+        "gmaster",              // Hartung Game Master
         "gx4000",               // Amstrad GX4000
         "intellivision",        // Mattel Electronics Intellivision
         "lcdgames",             // LCD Handheld Games
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 72d47ae0d..506ef20ef 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -64,6 +64,7 @@ namespace PlatformIds
         NINTENDO_GAME_BOY_COLOR,
         NINTENDO_GAMECUBE,
         SEGA_GENESIS,
+        HARTUNG_GAME_MASTER,
         AMSTRAD_GX4000,
         INTELLIVISION,
         LCD_GAMES,
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index ad4f7a459..d140edc13 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -66,6 +66,7 @@ namespace
         {GAMEENGINE_LUTRO, 206},
         {GAMEENGINE_LOWRES_NX, 244},
         {GAMEENGINE_WASM4, 262},
+        {HARTUNG_GAME_MASTER, 103},
         {APPLE_MACINTOSH, 146},
         {GOOGLE_ANDROID, 63},
         {LCD_GAMES, 75},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 36e862480..361f5fae1 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -245,6 +245,10 @@
         <name>genesis</name>
         <systemsortname>Console - 1989</systemsortname>
     </system>
+    <system>
+        <name>gmaster</name>
+        <systemsortname>Portable - 1990</systemsortname>
+    </system>
     <system>
         <name>gx4000</name>
         <systemsortname>Console - 1990</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index d8649aed7..70cd6611c 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -245,6 +245,10 @@
         <name>genesis</name>
         <systemsortname>Sega - Console - 1989</systemsortname>
     </system>
+    <system>
+        <name>gmaster</name>
+        <systemsortname>Hartung - Portable - 1990</systemsortname>
+    </system>
     <system>
         <name>gx4000</name>
         <systemsortname>Amstrad - Console - 1990</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index b018c1363..4b4470d2d 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -245,6 +245,10 @@
         <name>genesis</name>
         <systemsortname>Sega - 1989</systemsortname>
     </system>
+    <system>
+        <name>gmaster</name>
+        <systemsortname>Hartung - 1990</systemsortname>
+    </system>
     <system>
         <name>gx4000</name>
         <systemsortname>Amstrad - 1990</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index 5961b1b0c..1c85486d8 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -245,6 +245,10 @@
         <name>genesis</name>
         <systemsortname>1989</systemsortname>
     </system>
+    <system>
+        <name>gmaster</name>
+        <systemsortname>1990</systemsortname>
+    </system>
     <system>
         <name>gx4000</name>
         <systemsortname>1990</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index da41c54fd..c23ec00a1 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -687,6 +687,15 @@
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
+    <system>
+        <name>gmaster</name>
+        <fullname>Hartung Game Master</fullname>
+        <path>%ROMPATH%/gmaster</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM%</command>
+        <platform>gmaster</platform>
+        <theme>gmaster</theme>
+    </system>
     <system>
         <name>gx4000</name>
         <fullname>Amstrad GX4000</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 376159ee7..7b7c006c2 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -709,6 +709,15 @@
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
+    <system>
+        <name>gmaster</name>
+        <fullname>Hartung Game Master</fullname>
+        <path>%ROMPATH%/gmaster</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM%</command>
+        <platform>gmaster</platform>
+        <theme>gmaster</theme>
+    </system>
     <system>
         <name>gx4000</name>
         <fullname>Amstrad GX4000</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 33e16a614..1ee98fb5a 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -709,6 +709,15 @@
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
+    <system>
+        <name>gmaster</name>
+        <fullname>Hartung Game Master</fullname>
+        <path>%ROMPATH%\gmaster</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\gmaster gmaster -cart %ROM%</command>
+        <platform>gmaster</platform>
+        <theme>gmaster</theme>
+    </system>
     <system>
         <name>gx4000</name>
         <fullname>Amstrad GX4000</fullname>