diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index 74c6b787382..78b5046db8b 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -73,6 +73,18 @@ Form factor: Desktop PC
 CPU: Intel 286, 8MHz
 RAM: 640KB
 Mass storage: Floppy: 5.25" 1.2Mb, HDD: 40Mb
+
+Nixdorf 8810 M55
+================
+Links: https://www.computerwoche.de/a/auch-nixdorf-nun-in-der-at-clone-riege,1166613
+Info: Rebadged NCR PC-8, an AT-clone in a huge desktop case
+Form factor: Desktop PC
+CPU: Intel 286; CPU card has a 20Mhz, a 12 MHz and a 14.31818 crystal
+RAM: 512K on CPU card, 128K on a piggyback card and a memory expansion board
+Bus: Passive backplane, ISA
+Video: Paradise EGA on another piggyback board
+Mass storage: Floppy: 5.25" 1.2MB, MFM HDD
+
 ***************************************************************************/
 
 #include "emu.h"
@@ -131,6 +143,7 @@ public:
 	void pc40iii(machine_config &config);
 	void atvga(machine_config &config);
 	void at386(machine_config &config);
+	void n8810m55(machine_config &config);
 	void ews286(machine_config &config);
 
 	void init_at();
@@ -834,6 +847,14 @@ void at_state::comportii(machine_config &config)
 	m_ram->set_default_size("640K").set_extra_options("1152K,1664K,2176K,2688K,4224K");
 }
 
+// Nixdorf 8810 M55
+void at_state::n8810m55(machine_config &config)
+{
+	ibm5170(config);
+	m_maincpu->set_clock(6000000); 
+	subdevice<isa16_slot_device>("isa1")->set_default_option("ega"); 
+}
+
 //**************************************************************************
 //  ROM DEFINITIONS
 //**************************************************************************
@@ -1640,12 +1661,20 @@ ROM_START( dsys200 )
 ROM_END
 
 // Ericsson WS286
-ROM_START(ews286 ) // Computer is brown/yellow-ish with Ericsson logo
-	ROM_REGION(0x20000,"bios", 0)
+ROM_START( ews286 ) // Computer is brown/yellow-ish with Ericsson logo
+	ROM_REGION(0x20000, "bios", 0)
 	ROM_LOAD16_BYTE( "rys_103_1002_r8a_3c00_ic-pos_71.bin", 0x18000, 0x4000, CRC(af179e56) SHA1(58b1df46d6e68eef472a0529cb9317abaf17880f)) // Last ROM set and has Nokia
 	ROM_LOAD16_BYTE( "rys_103_1003_r8a_8600_ic-pos_69.bin", 0x18001, 0x4000, CRC(555502cb) SHA1(1977fe54b69c5e52731bf3eb8bdabe777aac014b)) // copyright patched in both roms
 ROM_END
 
+// Nixdorf 8810 M55
+ROM_START( n8810m55 )
+    ROM_REGION(0x20000, "bios", 0 )
+	ROM_LOAD16_BYTE( "150-3872_u113_27_4.5.1.bin", 0x10001, 0x8000, CRC(35ff4fba) SHA1(557f0f98c27af76f6fa6990592e7150f5fc1fc02))
+	ROM_LOAD16_BYTE( "150-3873_u127_30_4.5.1.bin", 0x10000, 0x8000, CRC(5a7e6643) SHA1(f3890919a772eead7232bd227b2c8677377f6e24))
+ROM_END
+	
+
 // Nokia Data WS286
 //ROM_START(nws286 ) // Computer is grey with Nokia logo.
 //  ROM_REGION(0x20000,"bios", 0)
@@ -1710,4 +1739,5 @@ COMP( 1987, comportii ,ibm5170, 0,       comportii, 0,     at_state,     init_at
 COMP( 1987, comportiii,ibm5170, 0,       comportiii,0,     at_state,     init_at,        "Compaq",      "Portable III", MACHINE_NOT_WORKING )
 COMP( 1988, comslt286, ibm5170, 0,       atvga,     0,     at_state,     init_at,        "Compaq",      "SLT/286", MACHINE_NOT_WORKING )
 COMP( 1986, ews286,    ibm5170, 0,       ews286,    0,     at_state,     init_at,        "Ericsson",    "Ericsson WS286", MACHINE_NOT_WORKING )
+COMP( 1986, n8810m55,  ibm5170, 0,       n8810m55,  0,     at_state,     init_at,        "Nixdorf Computer AG", "8810 M55", MACHINE_NOT_WORKING )
 //COMP( 1988, nws286,    ibm5170,  0,      ews286,    0,     at_state,     at,        "Nokia Data",  "Nokia Data WS286", MACHINE_NOT_WORKING )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 6a114c56ab6..5cd4b5cd90e 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -2422,6 +2422,7 @@ megapc                          // 1992 Amstrad plc
 megapcpl                        //
 megapcpla                       // AMI BIOS version with Winbond WINBUS chipset
 neat                            // 1989 New Enhanced AT chipset, AMI BIOS
+n8810m55						// Nixdorf 8810 M55
 //nws286                          // 1988 Nokia WS286
 pc2386                          //
 qi600                           // 1988 Apricot Qi 600 (Neptune Motherboard