diff --git a/src/machine/m_at.c b/src/machine/m_at.c
index ed03b4b62..6dd7e6cc6 100644
--- a/src/machine/m_at.c
+++ b/src/machine/m_at.c
@@ -8,6 +8,8 @@
 #include "../dma.h"
 #include "../mem.h"
 #include "../device.h"
+#include "../floppy/fdd.h"
+#include "../floppy/fdc.h"
 #include "../nvr.h"
 #include "../game/gameport.h"
 #include "../keyboard.h"
@@ -97,3 +99,12 @@ machine_at_ide_top_remap_init(machine_t *model)
 
     mem_remap_top_384k();
 }
+
+
+void
+machine_at_ibm_init(machine_t *model)
+{
+    machine_at_top_remap_init(model);
+
+    device_add(&fdc_at_device);
+}
diff --git a/src/machine/machine.h b/src/machine/machine.h
index b659f4fe0..4c80a70f9 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -8,15 +8,15 @@
  *
  *		Handling of the emulated machines.
  *
- * Version:	@(#)machine.h	1.0.16	2018/01/04
+ * Version:	@(#)machine.h	1.0.17	2018/01/22
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
  *
  *		Copyright 2008-2018 Sarah Walker.
- *		Copyright 2016,2018 Miran Grca.
- *		Copyright 2018 Fred N. van Kempen.
+ *		Copyright 2016-2018 Miran Grca.
+ *		Copyright 2017,2018 Fred N. van Kempen.
  */
 #ifndef EMU_MACHINE_H
 # define EMU_MACHINE_H
@@ -104,6 +104,8 @@ extern void	machine_at_ps2_ide_init(machine_t *);
 extern void	machine_at_top_remap_init(machine_t *);
 extern void	machine_at_ide_top_remap_init(machine_t *);
 
+extern void	machine_at_ibm_init(machine_t *);
+
 extern void	machine_at_t3100e_init(machine_t *);
 
 extern void	machine_at_p54tp4xe_init(machine_t *);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index b92ff5392..2242d99f9 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -11,7 +11,7 @@
  * NOTES:	OpenAT wip for 286-class machine with open BIOS.
  *		PS2_M80-486 wip, pending receipt of TRM's for machine.
  *
- * Version:	@(#)machine_table.c	1.0.13	2018/01/19
+ * Version:	@(#)machine_table.c	1.0.14	2018/01/22
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -68,10 +68,10 @@ machine_t machines[] = {
 #endif
 #endif
     { "[286 ISA] Hyundai Super-286TR",		ROM_SUPER286TR,		"super286tr",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT,								512,16384, 128, 127,		 machine_at_scat_init, NULL, nvr_at_close		},
-    { "[286 ISA] IBM AT",			ROM_IBMAT,		"ibmat",		{{"",      cpus_ibmat},       {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT,								256,15872, 128,  63,	    machine_at_top_remap_init, NULL, nvr_at_close		},
+    { "[286 ISA] IBM AT",			ROM_IBMAT,		"ibmat",		{{"",      cpus_ibmat},       {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT,								256,15872, 128,  63,		  machine_at_ibm_init, NULL, nvr_at_close		},
     { "[286 ISA] IBM PS/1 model 2011",		ROM_IBMPS1_2011,	"ibmps1es",		{{"",      cpus_ps1_m2011},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2,				512,16384, 512, 127,	       machine_ps1_m2011_init, NULL, nvr_at_close		},
     { "[286 ISA] IBM PS/2 model 30-286",	ROM_IBMPS2_M30_286,	"ibmps2_m30_286",	{{"",      cpus_ps2_m30_286}, {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2,				  1,   16,   1, 127,	     machine_ps2_m30_286_init, NULL, nvr_at_close		},
-    { "[286 ISA] IBM XT Model 286",		ROM_IBMXT286,		"ibmxt286",		{{"",      cpus_ibmxt286},    {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT,								256,15872, 128,  63,	    machine_at_top_remap_init, NULL, nvr_at_close		},
+    { "[286 ISA] IBM XT Model 286",		ROM_IBMXT286,		"ibmxt286",		{{"",      cpus_ibmxt286},    {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT,								256,15872, 128,  63,		  machine_at_ibm_init, NULL, nvr_at_close		},
     { "[286 ISA] Samsung SPC-4200P",		ROM_SPC4200P,		"spc4200p",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2,							512, 2048, 128, 127,		 machine_at_scat_init, NULL, nvr_at_close		},
 #ifdef WALTJE
     { "[286 ISA] OpenAT 286",			ROM_OPENAT,		"open_at",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_ISA | MACHINE_AT,								512, 4096, 128, 127,		      machine_at_init, NULL, nvr_at_close		},