diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 2731e7fda..3f0a6ab71 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -9,7 +9,7 @@
  *		Implementation of the NEC uPD-765 and compatible floppy disk
  *		controller.
  *
- * Version:	@(#)fdc->c	1.0.15	2018/02/02
+ * Version:	@(#)fdc->c	1.0.16	2018/02/02
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -2062,16 +2062,6 @@ device_t fdc_xt_device = {
     NULL, NULL, NULL, NULL
 };
 
-device_t fdc_xt_amstrad_device = {
-    "PC/XT Floppy Drive Controller (Amstrad)",
-    0,
-    FDC_FLAG_DISKCHG_ACTLOW,
-    fdc_init,
-    fdc_close,
-    fdc_reset,
-    NULL, NULL, NULL, NULL
-};
-
 device_t fdc_pcjr_device = {
     "PCjr Floppy Drive Controller",
     0,
diff --git a/src/floppy/fdc.h b/src/floppy/fdc.h
index ba6fe4ebe..7fa6cf3cd 100644
--- a/src/floppy/fdc.h
+++ b/src/floppy/fdc.h
@@ -9,7 +9,7 @@
  *		Implementation of the NEC uPD-765 and compatible floppy disk
  *		controller.
  *
- * Version:	@(#)fdc.h	1.0.3	2018/01/16
+ * Version:	@(#)fdc.h	1.0.4	2018/02/02
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -156,7 +156,6 @@ extern uint8_t	fdc_ps1_525(void);
 
 #ifdef EMU_DEVICE_H
 extern device_t	fdc_xt_device;
-extern device_t	fdc_xt_amstrad_device;
 extern device_t	fdc_pcjr_device;
 extern device_t	fdc_at_device;
 extern device_t	fdc_at_actlow_device;
diff --git a/src/keyboard_xt.c b/src/keyboard_xt.c
index 4d4296dab..71d55d4fb 100644
--- a/src/keyboard_xt.c
+++ b/src/keyboard_xt.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the XT-style keyboard.
  *
- * Version:	@(#)keyboard_xt.c	1.0.7	2018/01/28
+ * Version:	@(#)keyboard_xt.c	1.0.8	2018/02/02
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -387,7 +387,6 @@ kbd_adddata_process(uint16_t val, void (*adddata)(uint16_t val))
 		}
 		break;
 	case FAKE_LSHIFT_OFF:
-		pclog("fake left shift on, scan code: ");
 		if (num_lock) {
 			if (!shift_states) {
 				/* Num lock on and no shifts are pressed, send non-inverted fake shift. */
diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index 5a70bf906..e8cc23add 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -32,7 +32,7 @@
  *		in alpha mode, but in highres ("ECD350") mode, it displays
  *		some semi-random junk. Video-memory pointer maybe?
  *
- * Version:	@(#)m_amstrad.c	1.0.9	2018/01/29
+ * Version:	@(#)m_amstrad.c	1.0.10	2018/02/02
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -1225,6 +1225,34 @@ machine_amstrad_init(machine_t *model)
     io_sethandler(0x007a, 1,
 		  ms_read, NULL, NULL, ms_write, NULL, NULL, ams);
 
+// 		device_add(&fdc_at_actlow_device);
+
+    switch(romset) {
+	case ROM_PC1512:
+		device_add(&fdc_xt_device);
+		break;
+
+	case ROM_PC1640:
+		device_add(&fdc_xt_device);
+		break;
+
+	case ROM_PC200:
+		device_add(&fdc_xt_device);
+		break;
+
+	case ROM_PC2086:
+		device_add(&fdc_at_actlow_device);
+		break;
+
+	case ROM_PC3086:
+		device_add(&fdc_at_actlow_device);
+		break;
+
+	case ROM_MEGAPC:
+		device_add(&fdc_at_actlow_device);
+		break;
+    }
+
     if (gfxcard == GFX_INTERNAL) switch(romset) {
 	case ROM_PC1512:
                 loadfont(L"roms/machines/pc1512/40078", 2);
@@ -1271,6 +1299,4 @@ machine_amstrad_init(machine_t *model)
 
     if (joystick_type != 7)
 	device_add(&gameport_device);
-
-    device_add(&fdc_xt_amstrad_device);
 }