diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 459370724..6fd73d57b 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -2326,7 +2326,7 @@ fdc_3f1_enable(fdc_t *fdc, int enable)
 const device_t fdc_xt_device = {
     "PC/XT Floppy Drive Controller",
     0,
-    0,
+    FDC_FLAG_AT,
     fdc_init,
     fdc_close,
     fdc_reset,
diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c
index 3b7ceb64d..bdc8149ef 100644
--- a/src/floppy/fdc_magitronic.c
+++ b/src/floppy/fdc_magitronic.c
@@ -56,7 +56,7 @@ b215_init(const device_t *info)
 
     rom_init(&dev->rom, ROM_B215, ROM_ADDR, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
 
-    device_add(&fdc_at_device);
+    device_add(&fdc_xt_device);
 
     return dev;
 }
diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c
index 1a6fc8fad..cf97a1fba 100644
--- a/src/floppy/fdc_pii15xb.c
+++ b/src/floppy/fdc_pii15xb.c
@@ -54,7 +54,7 @@ MiniMicro 4 uses a Zilog Z0765A08PSC(Clone of the NEC 765)
 MiniMicro 1 uses a National Semiconductor DP8473(Clone of the NEC 765 with additional NSC commands)
 
 Issues:
-MiniMicro 4 WON'T WORK with XT machines. This statement has to be confirmed by someone with the real card itself.
+MiniMicro 4 works only with a few XT machines. This statement has to be confirmed by someone with the real card itself.
 MiniMicro 4 also won't work with the XT FDC which the Zilog claims to be.
 */
 
@@ -77,7 +77,7 @@ MiniMicro 4 also won't work with the XT FDC which the Zilog claims to be.
 #include <86box/fdc_ext.h>
 
 #define DTK_VARIANT ((info->local == 158) ? ROM_PII_158B : ROM_PII_151B)
-#define DTK_CHIP ((info->local == 158) ? &fdc_at_device : &fdc_dp8473_device)
+#define DTK_CHIP ((info->local == 158) ? &fdc_xt_device : &fdc_dp8473_device)
 #define BIOS_ADDR (uint32_t)(device_get_config_hex20("bios_addr") & 0x000fffff)
 #define ROM_PII_151B L"roms/floppy/dtk/pii-151b.rom"
 #define ROM_PII_158B L"roms/floppy/dtk/pii-158b.rom"
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index 9aac75d6a..274eedad0 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -35,6 +35,7 @@
 #include <86box/rom.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/fdc_ext.h>
 #include <86box/hdc.h>
 #include <86box/sio.h>
 #include <86box/serial.h>
@@ -56,6 +57,8 @@ machine_at_mr286_init(const machine_t *model)
 
     machine_at_common_ide_init(model);
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -66,6 +69,8 @@ static void
 machine_at_headland_common_init(int ht386)
 {
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     if (ht386)
@@ -136,7 +141,10 @@ machine_at_quadt286_init(const machine_t *model)
 
     machine_at_common_init(model);
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&headland_gc10x_device);
 
     return ret;
@@ -157,6 +165,8 @@ machine_at_neat_init(const machine_t *model)
     machine_at_init(model);
 
     device_add(&neat_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -177,6 +187,8 @@ machine_at_neat_ami_init(const machine_t *model)
     machine_at_common_init(model);
 
     device_add(&neat_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     device_add(&keyboard_at_ami_device);
@@ -198,7 +210,10 @@ machine_at_px286_init(const machine_t *model)
 
     machine_at_common_init(model);
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&neat_device);
 
     return ret;
@@ -219,6 +234,8 @@ machine_at_micronics386_init(const machine_t *model)
     machine_at_init(model);
 
     device_add(&neat_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -230,6 +247,8 @@ machine_at_scat_init(const machine_t *model, int is_v4)
 {
     machine_at_common_init(model);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     if (is_v4)
@@ -245,6 +264,8 @@ machine_at_scatsx_init(const machine_t *model)
     machine_at_common_init(model);
 
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     device_add(&scat_sx_device);
@@ -434,6 +455,8 @@ machine_at_shuttle386sx_init(const machine_t *model)
 
     device_add(&intel_82335_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -456,6 +479,8 @@ machine_at_adi386sx_init(const machine_t *model)
 
     device_add(&intel_82335_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -502,7 +527,10 @@ machine_at_commodore_sl386sx16_init(const machine_t *model)
     machine_at_common_ide_init(model);
 
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&neat_device);
     /* Two serial ports - on the real hardware SL386SX-16, they are on the single UMC UM82C452. */
     device_add_inst(&ns16450_device, 1);
@@ -518,7 +546,10 @@ machine_at_scamp_common_init(const machine_t *model)
     machine_at_common_ide_init(model);
 
     device_add(&keyboard_ps2_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&vlsi_scamp_device);
 }
 
@@ -591,6 +622,8 @@ machine_at_awardsx_init(const machine_t *model)
     machine_at_init(model);
 
     device_add(&opti291_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -704,6 +737,8 @@ machine_at_olim290_init(const machine_t *model)
 
     machine_at_common_init(model);
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
     
     io_sethandler(0x069, 1, m290_read, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -730,6 +765,8 @@ machine_at_ncrpc8_init(const machine_t *model)
 
     machine_at_common_init(model);
     device_add(&keyboard_at_ncr_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
     
     return ret;
@@ -758,6 +795,8 @@ machine_at_ncr3302_init(const machine_t *model)
     machine_at_common_ide_init(model);
     device_add(&neat_device);
     device_add(&keyboard_at_ncr_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     if (gfxcard == VID_INTERNAL)
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index a0f8494b3..6cbfa1fa1 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -34,6 +34,7 @@
 #include <86box/pci.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/fdc_ext.h>
 #include <86box/rom.h>
 #include <86box/sio.h>
 #include <86box/hdc.h>
@@ -57,6 +58,8 @@ machine_at_acc386_init(const machine_t *model)
     machine_at_common_init(model);
     device_add(&acc2168_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -77,6 +80,8 @@ machine_at_asus386_init(const machine_t *model)
     machine_at_common_init(model);
     device_add(&rabbit_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -97,6 +102,8 @@ machine_at_sis401_init(const machine_t *model)
     machine_at_common_ide_init(model);
     device_add(&sis_85c401_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -117,6 +124,8 @@ machine_at_av4_init(const machine_t *model)
     machine_at_common_ide_init(model);
     device_add(&sis_85c460_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -137,6 +146,8 @@ machine_at_valuepoint433_init(const machine_t *model)	// hangs without the PS/2
     machine_at_common_ide_init(model);
     device_add(&sis_85c461_device);
     device_add(&keyboard_ps2_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -157,7 +168,10 @@ machine_at_ecs386_init(const machine_t *model)
 
     machine_at_common_init(model);
     device_add(&cs8230_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&keyboard_at_ami_device);
 
     return ret;
@@ -178,7 +192,10 @@ machine_at_spc6000a_init(const machine_t *model)
 
     machine_at_common_init_ex(model, 1);
     device_add(&cs8230_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&keyboard_at_samsung_device);
 
     return ret;
@@ -200,6 +217,8 @@ machine_at_rycleopardlx_init(const machine_t *model)
 
     device_add(&opti283_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -221,6 +240,8 @@ machine_at_486vchd_init(const machine_t *model)
 
     device_add(&via_vt82c49x_device);
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -241,6 +262,8 @@ machine_at_cs4031_init(const machine_t *model)
     machine_at_common_init(model);
     device_add(&cs4031_device);
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -326,9 +349,11 @@ machine_at_acera1g_init(const machine_t *model)
 
     device_add(&ali1429_device);
     device_add(&keyboard_ps2_acer_pci_device);
-    device_add(&fdc_at_device);
     device_add(&ide_isa_2ch_device);
 
+    if (fdc_type == FDC_INTERNAL)
+    device_add(&fdc_at_device);
+
     return ret;
 }
 
@@ -348,6 +373,8 @@ machine_at_ali1429_common_init(const machine_t *model)
     device_add(&ali1429_device);
 
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 }
 
@@ -402,6 +429,8 @@ machine_at_opti495_init(const machine_t *model)
     device_add(&opti495_device);
 
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -416,6 +445,8 @@ machine_at_opti495_ami_common_init(const machine_t *model)
     device_add(&opti495_device);
 
     device_add(&keyboard_at_ami_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 }
 
@@ -469,6 +500,8 @@ machine_at_403tg_init(const machine_t *model)
     device_add(&opti895_device);
 
     device_add(&keyboard_at_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     return ret;
@@ -522,6 +555,8 @@ static void
 machine_at_sis_85c471_common_init(const machine_t *model)
 {
     machine_at_common_init(model);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     device_add(&sis_85c471_device);
@@ -884,6 +919,8 @@ machine_at_486ap4_init(const machine_t *model)
     pci_register_slot(0x0b, PCI_CARD_NORMAL, 3, 4, 1, 2);	/* 0b = Slot 3 */
     pci_register_slot(0x0c, PCI_CARD_NORMAL, 4, 1, 2, 3);	/* 0c = Slot 4 */
     device_add(&keyboard_ps2_ami_pci_device); /* Uses the AMIKEY KBC */
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
 
     device_add(&i420ex_device);
diff --git a/src/machine/m_at_commodore.c b/src/machine/m_at_commodore.c
index 51f8e56b4..eaf847602 100644
--- a/src/machine/m_at_commodore.c
+++ b/src/machine/m_at_commodore.c
@@ -45,6 +45,7 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/mem.h>
+#include <86box/fdc_ext.h>
 #include <86box/lpt.h>
 #include <86box/rom.h>
 #include <86box/serial.h>
@@ -108,7 +109,9 @@ machine_at_cmdpc_init(const machine_t *model)
 
     mem_remap_top(384);
 
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     cmd_uart = device_add(&i8250_device);
 
     cbm_io_init();
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index 84c6e97d2..3fdea739d 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -28,6 +28,7 @@
 #include <86box/pci.h>
 #include <86box/device.h>
 #include <86box/chipset.h>
+#include <86box/fdc_ext.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/timer.h>
@@ -98,7 +99,10 @@ machine_at_award_common_init(const machine_t *model)
     pci_register_slot(0x06, PCI_CARD_NORMAL, 4, 1, 2, 3);	/* 06 = Slot 4 */
     pci_register_slot(0x07, PCI_CARD_SCSI, 1, 2, 3, 4);		/* 07 = SCSI */
     pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&keyboard_ps2_pci_device);
 }
 
diff --git a/src/machine/m_at_t3100e.c b/src/machine/m_at_t3100e.c
index a5a7b9903..d04c4e2a0 100644
--- a/src/machine/m_at_t3100e.c
+++ b/src/machine/m_at_t3100e.c
@@ -163,6 +163,7 @@
 #include "cpu.h"
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/fdc_ext.h>
 #include <86box/machine.h>
 #include <86box/m_at_t3100e.h>
 
@@ -761,8 +762,12 @@ int machine_at_t3100e_init(const machine_t *model)
         machine_at_common_ide_init(model);
 
 	device_add(&keyboard_at_toshiba_device);
-	device_add(&fdc_at_device);
 
+    if (fdc_type == FDC_INTERNAL)
+	{
+	device_add(&fdc_at_device);
+	}
+	
 	/* Hook up system control port */
 	io_sethandler(0x8084, 0x0001, 
 			t3100e_sys_in, NULL, NULL,
diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c
index 3295fc884..bb87bfb85 100644
--- a/src/machine/m_ps2_mca.c
+++ b/src/machine/m_ps2_mca.c
@@ -57,6 +57,7 @@
 #include <86box/device.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/fdc_ext.h>
 #include <86box/nvr.h>
 #include <86box/nvr_ps2.h>
 #include <86box/keyboard.h>
@@ -1259,6 +1260,8 @@ static void
 machine_ps2_common_init(const machine_t *model)
 {
         machine_common_init(model);
+
+        if (fdc_type == FDC_INTERNAL)
 	device_add(&fdc_at_device);
 
         dma16_init();
diff --git a/src/machine/m_xt_laserxt.c b/src/machine/m_xt_laserxt.c
index 20c0e21ff..6b360353d 100644
--- a/src/machine/m_xt_laserxt.c
+++ b/src/machine/m_xt_laserxt.c
@@ -16,6 +16,7 @@
 #include <86box/timer.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/fdc_ext.h>
 #include <86box/gameport.h>
 #include <86box/keyboard.h>
 
@@ -169,6 +170,8 @@ machine_xt_lxt3_init(const machine_t *model)
     pit_ctr_set_out_func(&pit->counters[1], pit_refresh_timer_xt);
 
     device_add(&keyboard_xt_lxt3_device);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_xt_device);
     nmi_init();
     if (joystick_type)
diff --git a/src/machine/m_xt_olivetti.c b/src/machine/m_xt_olivetti.c
index a2f3d2725..cd0790a3c 100644
--- a/src/machine/m_xt_olivetti.c
+++ b/src/machine/m_xt_olivetti.c
@@ -724,6 +724,8 @@ machine_xt_olim24_init(const machine_t *model)
     memset(m24_kbd, 0x00, sizeof(olim24_kbd_t));
 
     machine_common_init(model);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_xt_device);
 
     /* Address 66-67 = mainboard dip-switch settings */
@@ -809,6 +811,8 @@ machine_xt_olim19_init(const machine_t *model)
     memset(vid, 0x00, sizeof(olim19_vid_t));
 	
     machine_common_init(model);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_xt_device);
 
     m19_vid_init(vid);
diff --git a/src/machine/m_xt_xi8088.c b/src/machine/m_xt_xi8088.c
index 39fe5e2cf..93948bddf 100644
--- a/src/machine/m_xt_xi8088.c
+++ b/src/machine/m_xt_xi8088.c
@@ -11,6 +11,7 @@
 #include <86box/device.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/fdc_ext.h>
 #include <86box/nmi.h>
 #include <86box/nvr.h>
 #include <86box/gameport.h>
@@ -172,7 +173,10 @@ machine_xt_xi8088_init(const machine_t *model)
 
     /* TODO: set UMBs? See if PCem always sets when we have > 640KB ram and avoids conflicts when a peripheral uses the same memory space */
     machine_common_init(model);
+
+    if (fdc_type == FDC_INTERNAL)
     device_add(&fdc_at_device);
+
     device_add(&keyboard_ps2_xi8088_device);
     nmi_init();
     device_add(&ibmat_nvr_device);