diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 5d4d6771f9f..62433da41f2 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -817,6 +817,19 @@ if (MACHINES["CDP1879"]~=null) then
 end
 
 
+---------------------------------------------------
+--
+--@src/devices/machine/chessmachine.h,MACHINES["CHESSMACHINE"] = true
+---------------------------------------------------
+
+if (MACHINES["CHESSMACHINE"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/chessmachine.cpp",
+		MAME_DIR .. "src/devices/machine/chessmachine.h",
+	}
+end
+
+
 ---------------------------------------------------
 --
 --@src/devices/machine/com8116.h,MACHINES["COM8116"] = true
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 6eb661831d1..70773a35f4b 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -424,6 +424,7 @@ MACHINES["BANKDEV"] = true
 --MACHINES["BIM68153"] = true
 MACHINES["CDP1852"] = true
 MACHINES["CDP1871"] = true
+--MACHINES["CHESSMACHINE"] = true
 MACHINES["CMOS40105"] = true
 MACHINES["CDU76S"] = true
 MACHINES["COM8116"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index d58992be0a1..04e3b139321 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -429,8 +429,9 @@ MACHINES["BIM68153"] = true
 MACHINES["CDP1852"] = true
 MACHINES["CDP1871"] = true
 MACHINES["CDP1879"] = true
-MACHINES["CMOS40105"] = true
 --MACHINES["CDU76S"] = true
+MACHINES["CHESSMACHINE"] = true
+MACHINES["CMOS40105"] = true
 MACHINES["COM8116"] = true
 MACHINES["CR589"] = true
 MACHINES["CS4031"] = true
diff --git a/src/mame/machine/chessmachine.cpp b/src/devices/machine/chessmachine.cpp
similarity index 100%
rename from src/mame/machine/chessmachine.cpp
rename to src/devices/machine/chessmachine.cpp
diff --git a/src/mame/machine/chessmachine.h b/src/devices/machine/chessmachine.h
similarity index 100%
rename from src/mame/machine/chessmachine.h
rename to src/devices/machine/chessmachine.h