diff --git a/src/device/serial.c b/src/device/serial.c
index 8483f7fe3..deb97225a 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -999,8 +999,7 @@ void
 serial_standalone_init(void)
 {
     while (next_inst < SERIAL_MAX)
-        device_add_inst(!strcmp(machine_get_internal_name(), "if386sx") ? &ns16450_device :
-                        &ns8250_device, next_inst + 1);
+        device_add_inst(&ns8250_device, next_inst + 1);
 };
 
 const device_t ns8250_device = {
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index 033233955..b084bfbbd 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -653,7 +653,9 @@ machine_at_if386sx_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
+    device_add(&amstrad_megapc_nvr_device); /* NVR that is initialized to all 0x00's. */
+
     device_add(&keyboard_at_phoenix_device);
 
     device_add(&neat_sx_device);
@@ -663,6 +665,12 @@ machine_at_if386sx_init(const machine_t *model)
     if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
+    /*
+       One serial port - on the real hardware IF386AX, it is on the VL 16C451,
+       alognside the bidirectional parallel port.
+     */
+    device_add_inst(&ns16450_device, 1);
+
     return ret;
 }