diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index ff806297e..bdd93ec5b 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -386,11 +386,7 @@ cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
         return 1;
 
     /* Cyrix 6x86MX on the NuPRO 592. */
-    if (((cpu_s->cyrix_id & 0xff00) == 0x0400) && (strstr(machine_s->internal_name, "nupro") != NULL))
-        return 0;
-
-    /* Cyrix 6x86MX or MII on the P5MMS98. */
-    if ((cpu_s->cpu_type == CPU_Cx6x86MX) && (strstr(machine_s->internal_name, "p5mms98") != NULL))
+    if (((cpu_s->cyrix_id & 0xff00) == 0x0400) && (machine_s->init == machine_at_nupro592_init))
         return 0;
 
     /* Check CPU blocklist. */
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index d36a6585f..f69544ecd 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -15476,7 +15476,7 @@ const machine_t machines[] = {
         .gpio_acpi_handler = NULL,
         .cpu = {
             .package = CPU_PKG_SOCKET5_7,
-            .block = CPU_BLOCK_NONE,
+            .block = CPU_BLOCK(CPU_Cx6x86MX),
             .min_bus = 50000000,
             .max_bus = 75000000,
             .min_voltage = 2100,