diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index a3fca087adf..ae669b9e93e 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1572,6 +1572,8 @@ files {
 
 createMESSProjects(_target, _subtarget, "att")
 files {
+	MAME_DIR .. "src/mame/drivers/att4425.cpp",
+	MAME_DIR .. "src/mame/drivers/att630.cpp",
 	MAME_DIR .. "src/mame/drivers/unixpc.cpp",
 }
 
@@ -3424,7 +3426,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/anzterm.cpp",
 	MAME_DIR .. "src/mame/drivers/applix.cpp",
 	MAME_DIR .. "src/mame/drivers/argox.cpp",
-	MAME_DIR .. "src/mame/drivers/att4425.cpp",
 	MAME_DIR .. "src/mame/drivers/attache.cpp",
 	MAME_DIR .. "src/mame/drivers/aussiebyte.cpp",
 	MAME_DIR .. "src/mame/includes/aussiebyte.h",
diff --git a/src/mame/drivers/att630.cpp b/src/mame/drivers/att630.cpp
new file mode 100644
index 00000000000..c0ade7cae8e
--- /dev/null
+++ b/src/mame/drivers/att630.cpp
@@ -0,0 +1,65 @@
+// license:BSD-3-Clause
+// copyright-holders:
+/***********************************************************************************************************************************
+
+Skeleton driver for AT&T 630 MTG terminal.
+
+************************************************************************************************************************************/
+
+#include "emu.h"
+#include "cpu/m68000/m68000.h"
+#include "machine/mc68681.h"
+
+
+class att630_state : public driver_device
+{
+public:
+	att630_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+	{ }
+
+private:
+	required_device<cpu_device> m_maincpu;
+};
+
+static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 16, att630_state )
+	AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_REGION("maincpu", 0)
+	AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE8("duart1", scn2681_device, read, write, 0x00ff)
+	AM_RANGE(0x200020, 0x20003f) AM_DEVREADWRITE8("duart2", scn2681_device, read, write, 0x00ff)
+	AM_RANGE(0x760000, 0x77ffff) AM_RAM
+	AM_RANGE(0x780000, 0x7bffff) AM_RAM
+	AM_RANGE(0x7c0000, 0x7fffff) AM_RAM
+	AM_RANGE(0xe00000, 0xe03fff) AM_NOP // 0x00ff mask
+ADDRESS_MAP_END
+
+static INPUT_PORTS_START( att630 )
+INPUT_PORTS_END
+
+static MACHINE_CONFIG_START( att630 )
+	MCFG_CPU_ADD("maincpu", M68000, XTAL_40MHz / 4) // clock not confirmed
+	MCFG_CPU_PROGRAM_MAP(mem_map)
+
+	MCFG_DEVICE_ADD("duart1", SCN2681, XTAL_3_6864MHz)
+
+	MCFG_DEVICE_ADD("duart2", SCN2681, XTAL_3_6864MHz)
+MACHINE_CONFIG_END
+
+
+/**************************************************************************************************************
+
+AT&T 630 MTG.
+Chips: 2x SCN2681A, AT&T 492F proprietory, blank chip, MC68000P10, MB113F316 (square), MB113F316 (DIL), PAL16R4ACN
+Crystals: 40MHz, 87.18336, 3.6864? (hard to read)
+
+***************************************************************************************************************/
+
+ROM_START( att630 )
+	ROM_REGION(0x40000, "maincpu", 0)
+	ROM_LOAD16_BYTE( "460621-1.bin", 0x00000, 0x10000, CRC(136749cd) SHA1(15378c292ddc7384cc69a35de55b69257a9f2a1c) )
+	ROM_LOAD16_BYTE( "460620-1.bin", 0x00001, 0x10000, CRC(27ab77f0) SHA1(5ff1d9ee5a69dee308d62c447ee67e1888afab0e) )
+	ROM_LOAD16_BYTE( "460623-1.bin", 0x20000, 0x10000, CRC(aeae12fb) SHA1(fa3ce26e4622875aa1dea7cf1bd1df237010ff2b) )
+	ROM_LOAD16_BYTE( "460622-1.bin", 0x20001, 0x10000, CRC(c108c1e0) SHA1(ef01349e890b8a4117c01e78d1c23fbd113ba58f) )
+ROM_END
+
+COMP( 1987, att630, 0, 0, att630, att630, att630_state, 0, "AT&T", "630 MTG", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/terminals.cpp b/src/mame/drivers/terminals.cpp
index 4c7bfa0c598..17b67929d7f 100644
--- a/src/mame/drivers/terminals.cpp
+++ b/src/mame/drivers/terminals.cpp
@@ -104,26 +104,6 @@ COMP( 1981, aaa, 0, 0, terminals, terminals, terminals_state, 0, "Ann Arbor", "A
 
 
 
-/**************************************************************************************************************
-
-AT&T 630 MTG.
-Chips: 2x SCN2681A, AT&T 492F proprietory, blank chip, MC68000P10, MB113F316 (square), MB113F316 (DIL), PAL16R4ACN
-Crystals: 40MHz, 87.18336, 3.6864? (hard to read)
-
-***************************************************************************************************************/
-
-ROM_START( att630 )
-	ROM_REGION(0x40000, "maincpu", 0)
-	ROM_LOAD16_BYTE( "460621-1.bin", 0x00000, 0x10000, CRC(136749cd) SHA1(15378c292ddc7384cc69a35de55b69257a9f2a1c) )
-	ROM_LOAD16_BYTE( "460620-1.bin", 0x00001, 0x10000, CRC(27ab77f0) SHA1(5ff1d9ee5a69dee308d62c447ee67e1888afab0e) )
-	ROM_LOAD16_BYTE( "460623-1.bin", 0x20000, 0x10000, CRC(aeae12fb) SHA1(fa3ce26e4622875aa1dea7cf1bd1df237010ff2b) )
-	ROM_LOAD16_BYTE( "460622-1.bin", 0x20001, 0x10000, CRC(c108c1e0) SHA1(ef01349e890b8a4117c01e78d1c23fbd113ba58f) )
-ROM_END
-
-COMP( 1987, att630, 0, 0, terminals, terminals, terminals_state, 0, "AT&T", "630 MTG", MACHINE_IS_SKELETON )
-
-
-
 /**************************************************************************************************************
 
 Hewlett-Packard HP-700/92.
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 43aa934cbb6..db31b71ba0f 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -2580,6 +2580,9 @@ tajmah                          // Tajmahal
 @source:att4425.cpp
 att4425                         //
 
+@source:att630.cpp
+att630                          //
+
 @source:attache.cpp
 attache                         // (c) 1982 Otrona
 attache816                      // (c) 1983 Otrona
@@ -36326,7 +36329,6 @@ t4490                           // Terco 4490 Mill CNC Control (c) 1986
 
 @source:terminals.cpp
 aaa
-att630
 hp700_92
 hp2622a
 qvt70
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 16b01348bfd..c5746ed48ac 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -72,6 +72,7 @@ atm.cpp
 atom.cpp
 atpci.cpp
 att4425.cpp
+att630.cpp
 attache.cpp
 aussiebyte.cpp
 avigo.cpp