diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 56b9a6addd2..3201a92387e 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -2153,6 +2153,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/hp80.cpp",
 	MAME_DIR .. "src/mame/drivers/hp2100.cpp",
 	MAME_DIR .. "src/mame/drivers/hp2620.cpp",
+	MAME_DIR .. "src/mame/drivers/hp700.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "hec2hrp")
diff --git a/src/mame/drivers/hp700.cpp b/src/mame/drivers/hp700.cpp
new file mode 100644
index 00000000000..6a3d2b3a29d
--- /dev/null
+++ b/src/mame/drivers/hp700.cpp
@@ -0,0 +1,66 @@
+// license:BSD-3-Clause
+// copyright-holders:
+/***********************************************************************************************************************************
+
+Skeleton driver for HP-700 series terminals.
+
+************************************************************************************************************************************/
+
+#include "emu.h"
+#include "cpu/nec/nec.h"
+#include "machine/mc68681.h"
+#include "machine/nvram.h"
+
+class hp700_state : public driver_device
+{
+public:
+	hp700_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, 8, hp700_state )
+	AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_REGION("maincpu", 0)
+	AM_RANGE(0x20000, 0x2ffff) AM_RAM
+	AM_RANGE(0x30000, 0x31fff) AM_RAM AM_SHARE("nvram")
+	AM_RANGE(0x34000, 0x34000) AM_READNOP
+	AM_RANGE(0x38000, 0x38fff) AM_DEVREADWRITE_MOD("duart", scn2681_device, read, write, rshift<8>)
+	AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x1fff0)
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( io_map, AS_IO, 8, hp700_state )
+	AM_RANGE(0x00f2, 0x00f2) AM_WRITENOP
+ADDRESS_MAP_END
+
+static INPUT_PORTS_START( hp700_92 )
+INPUT_PORTS_END
+
+static MACHINE_CONFIG_START( hp700_92 )
+	MCFG_CPU_ADD("maincpu", V20, XTAL_29_4912MHz / 3) // divider not verified
+	MCFG_CPU_PROGRAM_MAP(mem_map)
+	MCFG_CPU_IO_MAP(io_map)
+
+	MCFG_NVRAM_ADD_0FILL("nvram")
+
+	MCFG_DEVICE_ADD("duart", SCN2681, XTAL_29_4912MHz / 8) // divider not verified
+MACHINE_CONFIG_END
+
+
+/**************************************************************************************************************
+
+Hewlett-Packard HP-700/92.
+Chips: TC5564APL-15, proprietary square chip, D70108C-10 (V20), SCN2681, Beeper
+Crystals: 29.4912
+
+***************************************************************************************************************/
+
+ROM_START( hp700_92 )
+	ROM_REGION(0x20000, "maincpu", 0)
+	ROM_LOAD( "5181-8672.u803", 0x00000, 0x20000, CRC(21440d2f) SHA1(69a3de064ae2b18adc46c2fdd0bf69620375efe7) )
+ROM_END
+
+COMP( 1987, hp700_92, 0, 0, hp700_92, hp700_92, hp700_state, 0, "HP", "HP-700/92", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/terminals.cpp b/src/mame/drivers/terminals.cpp
index 91804561750..82354da9d1e 100644
--- a/src/mame/drivers/terminals.cpp
+++ b/src/mame/drivers/terminals.cpp
@@ -58,23 +58,6 @@ COMP( 1981, aaa, 0, 0, terminals, terminals, terminals_state, 0, "Ann Arbor", "A
 
 
 
-/**************************************************************************************************************
-
-Hewlett-Packard HP-700/92.
-Chips: TC5564APL-15, proprietory square chip, D70108C (V20), SCN2681, Beeper
-Crystals: 29.4912
-
-***************************************************************************************************************/
-
-ROM_START( hp700_92 )
-	ROM_REGION(0x20000, "maincpu", 0)
-	ROM_LOAD( "5181-8672.u803", 0x00000, 0x20000, CRC(21440d2f) SHA1(69a3de064ae2b18adc46c2fdd0bf69620375efe7) )
-ROM_END
-
-COMP( 1987, hp700_92, 0, 0, terminals, terminals, terminals_state, 0, "HP", "HP-700/92", MACHINE_IS_SKELETON )
-
-
-
 /**************************************************************************************************************
 
 Qume QVT-70.
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 002b4f5d8e8..bb1a022f621 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -15020,6 +15020,9 @@ hp49gp                          // HP 49G+
 @source:hp64k.cpp
 hp64k                           //
 
+@source:hp64k.cpp
+hp700_92                        //
+
 @source:hp9845.cpp
 hp9835a                         //
 hp9835b                         //
@@ -36415,7 +36418,6 @@ t4490                           // Terco 4490 Mill CNC Control (c) 1986
 
 @source:terminals.cpp
 aaa
-hp700_92
 qvt70
 qvt102
 qvt103
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 6ff5abd166c..ac6f3f28eeb 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -272,6 +272,7 @@ hp2600.cpp
 hp48.cpp
 hp49gp.cpp
 hp64k.cpp
+hp700.cpp
 hp9845.cpp
 hp9k.cpp
 hp9k_3xx.cpp