diff --git a/src/machine/m_ps1.c b/src/machine/m_ps1.c
index 094682636..52ac3a523 100644
--- a/src/machine/m_ps1.c
+++ b/src/machine/m_ps1.c
@@ -569,18 +569,16 @@ machine_ps1_m2133_init(const machine_t *model)
     if (bios_only || !ret)
 	return ret;
 
-    machine_at_common_init(model);
+    ps1_common_init(model);
+    device_add(&fdc_at_device);
+    device_add(&ide_isa_device);
+    device_add(&vl82c480_device);
+
+    nmi_mask = 0x80;
 
     if (gfxcard == VID_INTERNAL)
 	device_add(&gd5426_onboard_device);
 
-    device_add(&vl82c480_device);
-    device_add(&keyboard_at_device);
-    device_add(&fdc_at_device);
-    device_add(&ide_isa_device);
-
-    nmi_mask = 0x80;
-
     return ret;
 }