diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 284e5757b60..582dc930951 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -2106,6 +2106,7 @@ end
 --------------------------------------------------
 -- NEC uPD7810 series
 --@src/devices/cpu/upd7810/upd7810.h,CPUS["UPD7810"] = true
+--@src/devices/cpu/upd7810/upd7811.h,CPUS["UPD7810"] = true
 --------------------------------------------------
 
 if CPUS["UPD7810"] then
diff --git a/src/mame/hartung/gmaster.cpp b/src/mame/handheld/gmaster.cpp
similarity index 100%
rename from src/mame/hartung/gmaster.cpp
rename to src/mame/handheld/gmaster.cpp
diff --git a/src/mame/irem/olibochu.cpp b/src/mame/irem/olibochu.cpp
index fceaeaf767b..1d249b83874 100644
--- a/src/mame/irem/olibochu.cpp
+++ b/src/mame/irem/olibochu.cpp
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
+// copyright-holders:Nicola Salmoria, hap
 /***************************************************************************
 
 Oli-Boo-Chu (aka Punching Kid)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 090ccdbc090..8934483d7d9 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -15595,7 +15595,7 @@ gluck2                          // 1992 Yung Yu / CYE
 @source:skeleton/gm1000.cpp
 gm1000                          //
 
-@source:hartung/gmaster.cpp
+@source:handheld/gmaster.cpp
 gmaster                         // Hartung Gamemaster
 
 @source:skeleton/gnat10.cpp
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index fd6f5e34a7b..65c2b337221 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -289,6 +289,7 @@ gamepark/gp32.cpp
 gridcomp/gridcomp.cpp
 grundy/newbrain.cpp
 h01x/h01x.cpp
+handheld/gmaster.cpp
 handheld/hh_cop400.cpp
 handheld/hh_cops1.cpp
 handheld/hh_hmcs40.cpp
@@ -309,7 +310,6 @@ handheld/talkingfb.cpp
 handheld/tispeak.cpp
 handheld/tispellb.cpp
 handheld/wildfire.cpp
-hartung/gmaster.cpp
 hds/hds200.cpp
 heathkit/et3400.cpp
 heathkit/h19.cpp