diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c
index 32df44098..ef12b2187 100644
--- a/src/chipset/intel_piix.c
+++ b/src/chipset/intel_piix.c
@@ -1580,7 +1580,10 @@ piix_init(const device_t *info)
         dev->usb   = device_add(&usb_device);
 
     if (dev->type > 3) {
-        dev->nvr   = device_add(&piix4_nvr_device);
+        if (!strcmp(machine_get_internal_name(), "ms5156"))
+            dev->nvr   = device_add(&piix4_nvr_device);
+        else
+            dev->nvr   = device_add(&piix4_ami_1995_nvr_device);
         dev->smbus = device_add(&piix4_smbus_device);
 
         dev->acpi = device_add(&acpi_intel_device);