diff --git a/src/config.c b/src/config.c
index 7bf29155c..fc68bd7d4 100644
--- a/src/config.c
+++ b/src/config.c
@@ -244,20 +244,71 @@ load_machine(void)
 {
     ini_section_t cat = ini_find_section(config, "Machine");
     const char   *p;
+    const char   *migrate_from = NULL;
     int           c;
     int           i;
+    int           j;
     int           speed;
     double        multi;
 
     p = ini_section_get_string(cat, "machine", NULL);
-    if (p != NULL)
-        machine = machine_get_machine_from_internal_name(p);
-    else
+    if (p != NULL) {
+        migrate_from = p;
+        /* Migrate renamed machines. */
+        if (!strcmp(p, "430nx"))
+            machine = machine_get_machine_from_internal_name("586ip");
+        else if (!strcmp(p, "586mc1"))
+            machine = machine_get_machine_from_internal_name("586is");
+        else {
+            machine      = machine_get_machine_from_internal_name(p);
+            migrate_from = NULL;
+        }
+    } else
         machine = 0;
 
     if (machine >= machine_count())
         machine = machine_count() - 1;
 
+    /* Copy NVR files when migrating a machine to a new internal name. */
+    if (migrate_from) {
+        char old_fn[256];
+        strcpy(old_fn, migrate_from);
+        strcat(old_fn, ".");
+        c = strlen(old_fn);
+        char new_fn[256];
+        strcpy(new_fn, machines[machine].internal_name);
+        strcat(new_fn, ".");
+        i = strlen(new_fn);
+
+        /* Iterate through NVR files. */
+        DIR *dirp = opendir(nvr_path("."));
+        if (dirp) {
+            struct dirent *entry;
+            while ((entry = readdir(dirp))) {
+                /* Check if this file corresponds to the old name. */
+                if (strncmp(entry->d_name, old_fn, c))
+                    continue;
+
+                /* Add extension to the new name. */
+                strcpy(&new_fn[i], &entry->d_name[c]);
+
+                /* Only copy if a file with the new name doesn't already exist. */
+                FILE *g = nvr_fopen(new_fn, "rb");
+                if (!g) {
+                    FILE *f = nvr_fopen(entry->d_name, "rb");
+                    g       = nvr_fopen(new_fn, "wb");
+
+                    uint8_t buf[4096];
+                    while ((j = fread(buf, 1, sizeof(buf), f)))
+                        fwrite(buf, 1, j, g);
+
+                    fclose(f);
+                }
+                fclose(g);
+            }
+        }
+    }
+
     cpu_override = ini_section_get_int(cat, "cpu_override", 0);
     cpu_f        = NULL;
     p            = ini_section_get_string(cat, "cpu_family", NULL);
@@ -1864,11 +1915,6 @@ save_machine(void)
 {
     ini_section_t cat = ini_find_or_create_section(config, "Machine");
     const char   *p;
-    int           c;
-    int           i = 0;
-    int           legacy_mfg;
-    int           legacy_cpu = -1;
-    int           closest_legacy_cpu = -1;
 
     p = machine_get_internal_name();
     ini_section_set_string(cat, "machine", p);
@@ -1885,57 +1931,6 @@ save_machine(void)
     ini_section_delete_var(cat, "cpu_manufacturer");
     ini_section_delete_var(cat, "cpu");
 
-    /* Look for a machine entry on the legacy table. */
-    c = 0;
-    while (cpu_legacy_table[c].machine) {
-        if (!strcmp(p, cpu_legacy_table[c].machine))
-            break;
-        c++;
-    }
-    if (cpu_legacy_table[c].machine) {
-        /* Look for a corresponding CPU entry. */
-        const cpu_legacy_table_t *legacy_table_entry;
-        for (legacy_mfg = 0; legacy_mfg < 4; legacy_mfg++) {
-            if (!cpu_legacy_table[c].tables[legacy_mfg])
-                continue;
-
-            i = 0;
-            while (cpu_legacy_table[c].tables[legacy_mfg][i].family) {
-                legacy_table_entry = &cpu_legacy_table[c].tables[legacy_mfg][i];
-
-                /* Match the family name, speed and multiplier. */
-                if (!strcmp(cpu_f->internal_name, legacy_table_entry->family)) {
-                    if ((legacy_table_entry->rspeed == cpu_f->cpus[cpu].rspeed) &&
-                        (legacy_table_entry->multi == cpu_f->cpus[cpu].multi)) {
-                        /* Exact speed/multiplier match. */
-                        legacy_cpu = i;
-                        break;
-                    } else if ((legacy_table_entry->rspeed >= cpu_f->cpus[cpu].rspeed) &&
-                               (closest_legacy_cpu == -1))
-                        /* Closest speed match. */
-                        closest_legacy_cpu = i;
-                }
-
-                i++;
-            }
-
-            /* Use the closest speed match if no exact match was found. */
-            if ((legacy_cpu == -1) && (closest_legacy_cpu > -1)) {
-                legacy_cpu = closest_legacy_cpu;
-                break;
-            } else if (legacy_cpu > -1) /* exact match found */
-                break;
-        }
-
-        /* Set legacy values if a match was found. */
-        if (legacy_cpu > -1) {
-            if (legacy_mfg)
-                ini_section_set_int(cat, "cpu_manufacturer", legacy_mfg);
-            if (legacy_cpu)
-                ini_section_set_int(cat, "cpu", legacy_cpu);
-        }
-    }
-
     if (cpu_waitstates == 0)
         ini_section_delete_var(cat, "cpu_waitstates");
     else
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index b547fb99f..c525fac2a 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -115,13 +115,6 @@ enum {
     CPU_PKG_EBGA368       = (1 << 26)
 };
 
-#define MANU_INTEL           0
-#define MANU_AMD             1
-#define MANU_CYRIX           2
-#define MANU_IDT             3
-#define MANU_NEC             4
-#define MANU_IBM             5
-
 #define CPU_SUPPORTS_DYNAREC 1
 #define CPU_REQUIRES_DYNAREC 2
 #define CPU_ALTERNATE_XTAL   4
@@ -165,17 +158,6 @@ typedef struct {
     const CPU     *cpus;
 } cpu_family_t;
 
-typedef struct {
-    const char    *family;
-    const uint32_t rspeed;
-    const double   multi;
-} cpu_legacy_table_t;
-
-typedef struct {
-    const char                *machine;
-    const cpu_legacy_table_t **tables;
-} cpu_legacy_machine_t;
-
 #define C_FLAG     0x0001
 #define P_FLAG     0x0004
 #define A_FLAG     0x0010
@@ -528,7 +510,6 @@ extern cpu_state_t cpu_state;
 extern fpu_state_t fpu_state;
 
 extern const cpu_family_t         cpu_families[];
-extern const cpu_legacy_machine_t cpu_legacy_table[];
 extern cpu_family_t              *cpu_f;
 extern CPU                       *cpu_s;
 extern int                        cpu_override;
diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index fe55a4f23..195d432ff 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -1972,957 +1972,3 @@ const cpu_family_t cpu_families[] = {
     }
   // clang-format on
 };
-
-/* Legacy CPU tables for backwards compatibility. */
-
-static const cpu_legacy_table_t cpus_8088[] = {
-    {"8088",  4772728,  1},
-    { "8088", 7159092,  1},
-    { "8088", 8000000,  1},
-    { "8088", 10000000, 1},
-    { "8088", 12000000, 1},
-    { "8088", 16000000, 1},
-    { NULL,   0,        0}
-};
-
-static const cpu_legacy_table_t cpus_pcjr[] = {
-    {"8088", 4772728, 1},
-    { NULL,  0,       0}
-};
-
-static const cpu_legacy_table_t cpus_europc[] = {
-    {"8088_europc",  4772728, 1},
-    { "8088_europc", 7159092, 1},
-    { "8088_europc", 9545456, 1},
-    { NULL,          0,       0}
-};
-
-static const cpu_legacy_table_t cpus_8086[] = {
-    {"8086",  7159092,  1},
-    { "8086", 8000000,  1},
-    { "8086", 9545456,  1},
-    { "8086", 10000000, 1},
-    { "8086", 12000000, 1},
-    { "8086", 16000000, 1},
-    { NULL,   0,        0}
-};
-
-static const cpu_legacy_table_t cpus_pc1512[] = {
-    {"8086", 8000000, 1},
-    { NULL,  0,       0}
-};
-
-static const cpu_legacy_table_t cpus_286[] = {
-    {"286",  6000000,  1},
-    { "286", 8000000,  1},
-    { "286", 10000000, 1},
-    { "286", 12500000, 1},
-    { "286", 16000000, 1},
-    { "286", 20000000, 1},
-    { "286", 25000000, 1},
-    { NULL,  0,        0}
-};
-
-static const cpu_legacy_table_t cpus_ibmat[] = {
-    {"286",  6000000, 1},
-    { "286", 8000000, 1},
-    { NULL,  0,       0}
-};
-
-static const cpu_legacy_table_t cpus_ibmxt286[] = {
-    {"286", 6000000, 1},
-    { NULL, 0,       0}
-};
-
-static const cpu_legacy_table_t cpus_ps1_m2011[] = {
-    {"286", 10000000, 1},
-    { NULL, 0,        0}
-};
-
-static const cpu_legacy_table_t cpus_ps2_m30_286[] = {
-    {"286",  10000000, 1},
-    { "286", 12500000, 1},
-    { "286", 16000000, 1},
-    { "286", 20000000, 1},
-    { "286", 25000000, 1},
-    { NULL,  0,        0}
-};
-
-static const cpu_legacy_table_t cpus_i386SX[] = {
-    {"i386sx",  16000000, 1},
-    { "i386sx", 20000000, 1},
-    { "i386sx", 25000000, 1},
-    { "i386sx", 33333333, 1},
-    { "i386sx", 40000000, 1},
-    { NULL,     0,        0}
-};
-
-static const cpu_legacy_table_t cpus_i386DX[] = {
-    {"i386dx",    16000000, 1},
-    { "i386dx",   20000000, 1},
-    { "i386dx",   25000000, 1},
-    { "i386dx",   33333333, 1},
-    { "i386dx",   40000000, 1},
-    { "rapidcad", 25000000, 1},
-    { "rapidcad", 33333333, 1},
-    { "rapidcad", 40000000, 1},
-    { NULL,       0,        0}
-};
-
-static const cpu_legacy_table_t cpus_Am386SX[] = {
-    {"am386sx",  16000000, 1},
-    { "am386sx", 20000000, 1},
-    { "am386sx", 25000000, 1},
-    { "am386sx", 33333333, 1},
-    { "am386sx", 40000000, 1},
-    { NULL,      0,        0}
-};
-
-static const cpu_legacy_table_t cpus_Am386DX[] = {
-    {"am386dx",  25000000, 1},
-    { "am386dx", 33333333, 1},
-    { "am386dx", 40000000, 1},
-    { NULL,      0,        0}
-};
-
-static const cpu_legacy_table_t cpus_ALiM6117[] = {
-    {"m6117",  33333333, 1},
-    { "m6117", 40000000, 1},
-    { NULL,    0,        0}
-};
-
-static const cpu_legacy_table_t cpus_486SLC[] = {
-    {"cx486slc",   20000000, 1},
-    { "cx486slc",  25000000, 1},
-    { "cx486slc",  33333333, 1},
-    { "cx486srx2", 32000000, 2},
-    { "cx486srx2", 40000000, 2},
-    { "cx486srx2", 50000000, 2},
-    { NULL,        0,        0}
-};
-
-static const cpu_legacy_table_t cpus_IBM486SLC[] = {
-    {"ibm486slc",   33333333,  1},
-    { "ibm486slc2", 40000000,  2},
-    { "ibm486slc2", 50000000,  2},
-    { "ibm486slc2", 66666666,  2},
-    { "ibm486slc3", 60000000,  3},
-    { "ibm486slc3", 75000000,  3},
-    { "ibm486slc3", 100000000, 3},
-    { NULL,         0,         0}
-};
-
-static const cpu_legacy_table_t cpus_IBM486BL[] = {
-    {"ibm486bl2",  50000000,  2},
-    { "ibm486bl2", 66666666,  2},
-    { "ibm486bl3", 75000000,  3},
-    { "ibm486bl3", 100000000, 3},
-    { NULL,        0,         0}
-};
-
-static const cpu_legacy_table_t cpus_486DLC[] = {
-    {"cx486dlc",   25000000, 1},
-    { "cx486dlc",  33333333, 1},
-    { "cx486dlc",  40000000, 1},
-    { "cx486drx2", 32000000, 2},
-    { "cx486drx2", 40000000, 2},
-    { "cx486drx2", 50000000, 2},
-    { "cx486drx2", 66666666, 2},
-    { NULL,        0,        0}
-};
-
-static const cpu_legacy_table_t cpus_i486S1[] = {
-    {"i486sx",   16000000,  1},
-    { "i486sx",  20000000,  1},
-    { "i486sx",  25000000,  1},
-    { "i486sx",  33333333,  1},
-    { "i486sx2", 50000000,  2},
-    { "i486sx2", 66666666,  2},
-    { "i486dx",  25000000,  1},
-    { "i486dx",  33333333,  1},
-    { "i486dx",  50000000,  1},
-    { "i486dx2", 40000000,  2},
-    { "i486dx2", 50000000,  2},
-    { "i486dx2", 66666666,  2},
-    { "idx4_od", 75000000,  3},
-    { "idx4_od", 100000000, 3},
-    { NULL,      0,         0}
-};
-
-static const cpu_legacy_table_t cpus_Am486S1[] = {
-    {"am486sx",   33333333, 1},
-    { "am486sx",  40000000, 1},
-    { "am486sx2", 50000000, 2},
-    { "am486sx2", 66666666, 2},
-    { "am486dx",  33333333, 1},
-    { "am486dx",  40000000, 1},
-    { "am486dx2", 50000000, 2},
-    { "am486dx2", 66666666, 2},
-    { "am486dx2", 80000000, 2},
-    { NULL,       0,        0}
-};
-
-static const cpu_legacy_table_t cpus_Cx486S1[] = {
-    {"cx486s",    25000000, 1.0},
-    { "cx486s",   33333333, 1.0},
-    { "cx486s",   40000000, 1.0},
-    { "cx486dx",  33333333, 1.0},
-    { "cx486dx",  40000000, 1.0},
-    { "cx486dx2", 50000000, 2.0},
-    { "cx486dx2", 66666666, 2.0},
-    { "cx486dx2", 80000000, 2.0},
-    { NULL,       0,        0  }
-};
-
-static const cpu_legacy_table_t cpus_i486[] = {
-    {"i486sx",        16000000,  1.0},
-    { "i486sx",       20000000,  1.0},
-    { "i486sx",       25000000,  1.0},
-    { "i486sx",       33333333,  1.0},
-    { "i486sx2",      50000000,  2.0},
-    { "i486sx2",      66666666,  2.0},
-    { "i486dx",       25000000,  1.0},
-    { "i486dx",       33333333,  1.0},
-    { "i486dx",       50000000,  1.0},
-    { "i486dx2",      40000000,  2.0},
-    { "i486dx2",      50000000,  2.0},
-    { "i486dx2",      66666666,  2.0},
-    { "idx4",         75000000,  3.0},
-    { "idx4",         100000000, 3.0},
-    { "idx4_od",      75000000,  3.0},
-    { "idx4_od",      100000000, 3.0},
-    { "pentium_p24t", 62500000,  2.5},
-    { "pentium_p24t", 83333333,  2.5},
-    { NULL,           0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_i486_PC330[] = {
-    {"i486dx2",       50000000,  2.0},
-    { "i486dx2",      66666666,  2.0},
-    { "idx4",         75000000,  3.0},
-    { "idx4",         100000000, 3.0},
-    { "pentium_p24t", 62500000,  2.5},
-    { "pentium_p24t", 83333333,  2.5},
-    { NULL,           0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Am486[] = {
-    {"am486sx",   33333333,  1.0},
-    { "am486sx",  40000000,  1.0},
-    { "am486sx2", 50000000,  2.0},
-    { "am486sx2", 66666666,  2.0},
-    { "am486dx",  33333333,  1.0},
-    { "am486dx",  40000000,  1.0},
-    { "am486dx2", 50000000,  2.0},
-    { "am486dx2", 66666666,  2.0},
-    { "am486dx2", 80000000,  2.0},
-    { "am486dx4", 75000000,  3.0},
-    { "am486dx4", 90000000,  3.0},
-    { "am486dx4", 100000000, 3.0},
-    { "am486dx4", 120000000, 3.0},
-    { "am5x86",   133333333, 4.0},
-    { "am5x86",   150000000, 3.0},
-    { "am5x86",   160000000, 4.0},
-    { NULL,       0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Cx486[] = {
-    {"cx486s",    25000000,  1.0},
-    { "cx486s",   33333333,  1.0},
-    { "cx486s",   40000000,  1.0},
-    { "cx486dx",  33333333,  1.0},
-    { "cx486dx",  40000000,  1.0},
-    { "cx486dx2", 50000000,  2.0},
-    { "cx486dx2", 66666666,  2.0},
-    { "cx486dx2", 80000000,  2.0},
-    { "cx486dx4", 75000000,  3.0},
-    { "cx486dx4", 100000000, 3.0},
-    { "cx5x86",   80000000,  2.0},
-    { "cx5x86",   100000000, 3.0},
-    { "cx5x86",   120000000, 3.0},
-    { "cx5x86",   133333333, 4.0},
-    { NULL,       0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_STPCDX[] = {
-    {"stpc_dx",  66666666, 1.0},
-    { "stpc_dx", 75000000, 1.0},
-    { NULL,      0,        0  }
-};
-
-static const cpu_legacy_table_t cpus_STPCDX2[] = {
-    {"stpc_dx2", 133333333, 2.0},
-    { NULL,      0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_6x863V[] = {
-    {"cx6x86",  80000000,  2.0},
-    { "cx6x86", 100000000, 2.0},
-    { "cx6x86", 110000000, 2.0},
-    { "cx6x86", 120000000, 2.0},
-    { "cx6x86", 133333333, 2.0},
-    { "cx6x86", 150000000, 2.0},
-    { NULL,     0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_6x86[] = {
-    {"cx6x86",    80000000,  2.0},
-    { "cx6x86",   100000000, 2.0},
-    { "cx6x86",   110000000, 2.0},
-    { "cx6x86",   120000000, 2.0},
-    { "cx6x86",   133333333, 2.0},
-    { "cx6x86",   150000000, 2.0},
-    { "cx6x86l",  110000000, 2.0},
-    { "cx6x86l",  120000000, 2.0},
-    { "cx6x86l",  133333333, 2.0},
-    { "cx6x86l",  150000000, 2.0},
-    { "cx6x86mx", 133333333, 2.0},
-    { "cx6x86mx", 166666666, 2.5},
-    { "cx6x86mx", 187500000, 2.5},
-    { "cx6x86mx", 208333333, 2.5},
-    { "mii",      233333333, 3.5},
-    { "mii",      250000000, 3.0},
-    { NULL,       0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_6x86SS7[] = {
-    {"cx6x86",    80000000,  2.0},
-    { "cx6x86",   100000000, 2.0},
-    { "cx6x86",   110000000, 2.0},
-    { "cx6x86",   120000000, 2.0},
-    { "cx6x86",   133333333, 2.0},
-    { "cx6x86",   150000000, 2.0},
-    { "cx6x86l",  110000000, 2.0},
-    { "cx6x86l",  120000000, 2.0},
-    { "cx6x86l",  133333333, 2.0},
-    { "cx6x86l",  150000000, 2.0},
-    { "cx6x86mx", 133333333, 2.0},
-    { "cx6x86mx", 166666666, 2.5},
-    { "cx6x86mx", 187500000, 2.5},
-    { "cx6x86mx", 208333333, 2.5},
-    { "mii",      233333333, 3.5},
-    { "mii",      250000000, 3.0},
-    { "mii",      250000000, 2.5},
-    { "mii",      285000000, 3.0},
-    { "mii",      300000000, 3.0},
-    { NULL,       0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_WinChip[] = {
-    {"winchip",    75000000,  1.5},
-    { "winchip",   90000000,  1.5},
-    { "winchip",   100000000, 1.5},
-    { "winchip",   120000000, 2.0},
-    { "winchip",   133333333, 2.0},
-    { "winchip",   150000000, 2.5},
-    { "winchip",   166666666, 2.5},
-    { "winchip",   180000000, 3.0},
-    { "winchip",   200000000, 3.0},
-    { "winchip",   225000000, 3.0},
-    { "winchip",   240000000, 4.0},
-    { "winchip2",  200000000, 3.0},
-    { "winchip2",  225000000, 3.0},
-    { "winchip2",  240000000, 4.0},
-    { "winchip2",  250000000, 3.0},
-    { "winchip2a", 200000000, 3.0},
-    { "winchip2a", 233333333, 3.5},
-    { NULL,        0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_WinChip_SS7[] = {
-    {"winchip",    75000000,  1.5},
-    { "winchip",   90000000,  1.5},
-    { "winchip",   100000000, 1.5},
-    { "winchip",   120000000, 2.0},
-    { "winchip",   133333333, 2.0},
-    { "winchip",   150000000, 2.5},
-    { "winchip",   166666666, 2.5},
-    { "winchip",   180000000, 3.0},
-    { "winchip",   200000000, 3.0},
-    { "winchip",   225000000, 3.0},
-    { "winchip",   240000000, 4.0},
-    { "winchip2",  200000000, 3.0},
-    { "winchip2",  225000000, 3.0},
-    { "winchip2",  240000000, 4.0},
-    { "winchip2",  250000000, 3.0},
-    { "winchip2a", 200000000, 3.0},
-    { "winchip2a", 233333333, 3.5},
-    { "winchip2a", 233333333, 7.0},
-    { "winchip2a", 250000000, 2.5},
-    { NULL,        0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Pentium5V[] = {
-    {"pentium_p5",         60000000,  1},
-    { "pentium_p5",        66666666,  1},
-    { "pentium_p54c_od5v", 120000000, 2},
-    { "pentium_p54c_od5v", 133333333, 2},
-    { NULL,                0,         0}
-};
-
-static const cpu_legacy_table_t cpus_PentiumS5[] = {
-    {"pentium_p54c",       75000000,  1.5},
-    { "pentium_p55c_od",   75000000,  1.5},
-    { "pentium_p54c",      90000000,  1.5},
-    { "pentium_p54c",      100000000, 2.0},
-    { "pentium_p54c",      100000000, 1.5},
-    { "pentium_p54c",      120000000, 2.0},
-    { "pentium_p54c",      133333333, 2.0},
-    { "pentium_p54c_od3v", 125000000, 3.0},
-    { "pentium_p54c_od3v", 150000000, 2.5},
-    { "pentium_p54c_od3v", 166666666, 2.5},
-    { "pentium_p55c_od",   125000000, 2.5},
-    { "pentium_p55c_od",   150000000, 2.5},
-    { "pentium_p55c_od",   166000000, 2.5},
-    { "pentium_p55c_od",   180000000, 3.0},
-    { "pentium_p55c_od",   200000000, 3.0},
-    { NULL,                0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Pentium3V[] = {
-    {"pentium_p54c",       75000000,  1.5},
-    { "pentium_p55c_od",   75000000,  1.5},
-    { "pentium_p54c",      90000000,  1.5},
-    { "pentium_p54c",      100000000, 2.0},
-    { "pentium_p54c",      100000000, 1.5},
-    { "pentium_p54c",      120000000, 2.0},
-    { "pentium_p54c",      133333333, 2.0},
-    { "pentium_p54c",      150000000, 2.5},
-    { "pentium_p54c",      166666666, 2.5},
-    { "pentium_p54c",      200000000, 3.0},
-    { "pentium_p54c_od3v", 125000000, 2.5},
-    { "pentium_p54c_od3v", 150000000, 2.5},
-    { "pentium_p54c_od3v", 166666666, 2.5},
-    { "pentium_p55c_od",   125000000, 2.5},
-    { "pentium_p55c_od",   150000000, 2.5},
-    { "pentium_p55c_od",   166000000, 2.5},
-    { "pentium_p55c_od",   180000000, 3.0},
-    { "pentium_p55c_od",   200000000, 3.0},
-    { NULL,                0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Pentium[] = {
-    {"pentium_p54c",       75000000,  1.5},
-    { "pentium_p55c_od",   75000000,  1.5},
-    { "pentium_p54c",      90000000,  1.5},
-    { "pentium_p54c",      100000000, 2.0},
-    { "pentium_p54c",      100000000, 1.5},
-    { "pentium_p54c",      120000000, 2.0},
-    { "pentium_p54c",      133333333, 2.0},
-    { "pentium_p54c",      150000000, 2.5},
-    { "pentium_p54c",      166666666, 2.5},
-    { "pentium_p54c",      200000000, 3.0},
-    { "pentium_p55c",      166666666, 2.5},
-    { "pentium_p55c",      200000000, 3.0},
-    { "pentium_p55c",      233333333, 3.5},
-    { "pentium_tillamook", 120000000, 2.0},
-    { "pentium_tillamook", 133333333, 2.0},
-    { "pentium_tillamook", 150000000, 2.5},
-    { "pentium_tillamook", 166666666, 2.5},
-    { "pentium_tillamook", 200000000, 3.0},
-    { "pentium_tillamook", 233333333, 3.5},
-    { "pentium_tillamook", 266666666, 4.0},
-    { "pentium_tillamook", 300000000, 4.5},
-    { "pentium_p54c_od3v", 125000000, 2.5},
-    { "pentium_p54c_od3v", 150000000, 2.5},
-    { "pentium_p54c_od3v", 166666666, 2.5},
-    { "pentium_p55c_od",   125000000, 2.5},
-    { "pentium_p55c_od",   150000000, 2.5},
-    { "pentium_p55c_od",   166000000, 2.5},
-    { "pentium_p55c_od",   180000000, 3.0},
-    { "pentium_p55c_od",   200000000, 3.0},
-    { NULL,                0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_K5[] = {
-    {"k5_5k86",  75000000,  1.5},
-    { "k5_ssa5", 75000000,  1.5},
-    { "k5_5k86", 90000000,  1.5},
-    { "k5_ssa5", 90000000,  1.5},
-    { "k5_5k86", 100000000, 1.5},
-    { "k5_ssa5", 100000000, 1.5},
-    { "k5_5k86", 120000000, 2.0},
-    { "k5_5k86", 133333333, 2.0},
-    { "k5_5k86", 150000000, 2.5},
-    { "k5_5k86", 166666666, 2.5},
-    { "k5_5k86", 200000000, 3.0},
-    { NULL,      0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_K56[] = {
-    {"k6_m6",  66666666,  1.0},
-    { "k6_m6", 100000000, 1.5},
-    { "k6_m6", 133333333, 2.0},
-    { "k6_m6", 166666666, 2.5},
-    { "k6_m6", 200000000, 3.0},
-    { "k6_m6", 233333333, 3.5},
-    { "k6_m7", 100000000, 1.5},
-    { "k6_m7", 133333333, 2.0},
-    { "k6_m7", 166666666, 2.5},
-    { "k6_m7", 200000000, 3.0},
-    { "k6_m7", 233333333, 3.5},
-    { "k6_m7", 266666666, 4.0},
-    { "k6_m7", 300000000, 4.5},
-    { "k6_2",  100000000, 1.5},
-    { "k6_2",  133333333, 2.0},
-    { "k6_2",  166666666, 2.5},
-    { "k6_2",  200000000, 3.0},
-    { "k6_2",  233333333, 3.5},
-    { "k6_2",  266666666, 4.0},
-    { "k6_2",  300000000, 4.5},
-    { "k6_2",  366666666, 5.5},
-    { NULL,    0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_K56_SS7[] = {
-    {"k6_m6",  66666666,  1.0},
-    { "k6_m6", 100000000, 1.5},
-    { "k6_m6", 133333333, 2.0},
-    { "k6_m6", 166666666, 2.5},
-    { "k6_m6", 200000000, 3.0},
-    { "k6_m6", 233333333, 3.5},
-    { "k6_m7", 100000000, 1.5},
-    { "k6_m7", 133333333, 2.0},
-    { "k6_m7", 166666666, 2.5},
-    { "k6_m7", 200000000, 3.0},
-    { "k6_m7", 233333333, 3.5},
-    { "k6_m7", 266666666, 4.0},
-    { "k6_m7", 300000000, 4.5},
-    { "k6_2",  100000000, 1.5},
-    { "k6_2",  133333333, 2.0},
-    { "k6_2",  166666666, 2.5},
-    { "k6_2",  200000000, 3.0},
-    { "k6_2",  233333333, 3.5},
-    { "k6_2",  266666666, 4.0},
-    { "k6_2",  300000000, 3.0},
-    { "k6_2",  332500000, 3.5},
-    { "k6_2",  350000000, 3.5},
-    { "k6_2",  366666666, 5.5},
-    { "k6_2",  380000000, 4.0},
-    { "k6_2",  400000000, 4.0},
-    { "k6_2",  450000000, 4.5},
-    { "k6_2",  475000000, 5.0},
-    { "k6_2",  500000000, 5.0},
-    { "k6_2",  533333333, 5.5},
-    { "k6_2",  550000000, 5.5},
-    { "k6_2p", 100000000, 1.5},
-    { "k6_2p", 133333333, 2.0},
-    { "k6_2p", 166666666, 2.5},
-    { "k6_2p", 200000000, 3.0},
-    { "k6_2p", 233333333, 3.5},
-    { "k6_2p", 266666666, 4.0},
-    { "k6_2p", 300000000, 3.0},
-    { "k6_2p", 332500000, 3.5},
-    { "k6_2p", 350000000, 3.5},
-    { "k6_2p", 366666666, 5.5},
-    { "k6_2p", 380000000, 4.0},
-    { "k6_2p", 400000000, 4.0},
-    { "k6_2p", 450000000, 4.5},
-    { "k6_2p", 475000000, 5.0},
-    { "k6_2p", 500000000, 5.0},
-    { "k6_2p", 533333333, 5.5},
-    { "k6_2p", 550000000, 5.5},
-    { "k6_3",  100000000, 1.5},
-    { "k6_3",  133333333, 2.0},
-    { "k6_3",  166666666, 2.5},
-    { "k6_3",  200000000, 3.0},
-    { "k6_3",  233333333, 3.5},
-    { "k6_3",  266666666, 4.0},
-    { "k6_3",  300000000, 3.0},
-    { "k6_3",  332500000, 3.5},
-    { "k6_3",  350000000, 3.5},
-    { "k6_3",  366666666, 5.5},
-    { "k6_3",  380000000, 4.0},
-    { "k6_3",  400000000, 4.0},
-    { "k6_3",  450000000, 4.5},
-    { "k6_3p", 75000000,  1.5},
-    { "k6_3p", 100000000, 1.5},
-    { "k6_3p", 133333333, 2.0},
-    { "k6_3p", 166666666, 2.5},
-    { "k6_3p", 200000000, 3.0},
-    { "k6_3p", 233333333, 3.5},
-    { "k6_3p", 266666666, 4.0},
-    { "k6_3p", 300000000, 3.0},
-    { "k6_3p", 332500000, 3.5},
-    { "k6_3p", 350000000, 3.5},
-    { "k6_3p", 366666666, 5.5},
-    { "k6_3p", 380000000, 4.0},
-    { "k6_3p", 400000000, 4.0},
-    { "k6_3p", 450000000, 4.5},
-    { "k6_3p", 475000000, 5.0},
-    { "k6_3p", 500000000, 5.0},
-    { NULL,    0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_PentiumPro[] = {
-    {"pentiumpro",   50000000,  1.0},
-    { "pentiumpro",  60000000,  1.0},
-    { "pentiumpro",  66666666,  1.0},
-    { "pentiumpro",  75000000,  1.5},
-    { "pentiumpro",  150000000, 2.5},
-    { "pentiumpro",  166666666, 2.5},
-    { "pentiumpro",  180000000, 3.0},
-    { "pentiumpro",  200000000, 3.0},
-    { "pentium2_od", 50000000,  1.0},
-    { "pentium2_od", 60000000,  1.0},
-    { "pentium2_od", 66666666,  1.0},
-    { "pentium2_od", 75000000,  1.5},
-    { "pentium2_od", 210000000, 3.5},
-    { "pentium2_od", 233333333, 3.5},
-    { "pentium2_od", 240000000, 4.0},
-    { "pentium2_od", 266666666, 4.0},
-    { "pentium2_od", 270000000, 4.5},
-    { "pentium2_od", 300000000, 4.5},
-    { "pentium2_od", 300000000, 5.0},
-    { "pentium2_od", 333333333, 5.0},
-    { NULL,          0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_PentiumII66[] = {
-    {"pentium2_klamath",    50000000,  1.0},
-    { "pentium2_klamath",   60000000,  1.0},
-    { "pentium2_klamath",   66666666,  1.0},
-    { "pentium2_klamath",   75000000,  1.5},
-    { "pentium2_klamath",   233333333, 3.5},
-    { "pentium2_klamath",   266666666, 4.0},
-    { "pentium2_klamath",   300000000, 4.5},
-    { "pentium2_deschutes", 50000000,  1.0},
-    { "pentium2_deschutes", 60000000,  1.0},
-    { "pentium2_deschutes", 66666666,  1.0},
-    { "pentium2_deschutes", 75000000,  1.5},
-    { "pentium2_deschutes", 266666666, 4.0},
-    { "pentium2_deschutes", 300000000, 4.5},
-    { "pentium2_deschutes", 333333333, 5.0},
-    { NULL,                 0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_PentiumII[] = {
-    {"pentium2_klamath",    50000000,  1.0},
-    { "pentium2_klamath",   60000000,  1.0},
-    { "pentium2_klamath",   66666666,  1.0},
-    { "pentium2_klamath",   75000000,  1.5},
-    { "pentium2_klamath",   233333333, 3.5},
-    { "pentium2_klamath",   266666666, 4.0},
-    { "pentium2_klamath",   300000000, 4.5},
-    { "pentium2_deschutes", 50000000,  1.0},
-    { "pentium2_deschutes", 60000000,  1.0},
-    { "pentium2_deschutes", 66666666,  1.0},
-    { "pentium2_deschutes", 75000000,  1.5},
-    { "pentium2_deschutes", 266666666, 4.0},
-    { "pentium2_deschutes", 300000000, 4.5},
-    { "pentium2_deschutes", 333333333, 5.0},
-    { "pentium2_deschutes", 350000000, 3.5},
-    { "pentium2_deschutes", 400000000, 4.0},
-    { "pentium2_deschutes", 450000000, 4.5},
-    { NULL,                 0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Xeon[] = {
-    {"pentium2_xeon",  75000000,  1.5},
-    { "pentium2_xeon", 100000000, 1.5},
-    { "pentium2_xeon", 133333333, 2.0},
-    { "pentium2_xeon", 166666666, 2.5},
-    { "pentium2_xeon", 400000000, 4.0},
-    { "pentium2_xeon", 450000000, 4.5},
-    { NULL,            0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Celeron[] = {
-    {"celeron_mendocino",  66666666,  1.0},
-    { "celeron_mendocino", 100000000, 1.5},
-    { "celeron_mendocino", 133333333, 2.0},
-    { "celeron_mendocino", 166666666, 2.5},
-    { "celeron_mendocino", 300000000, 4.5},
-    { "celeron_mendocino", 333333333, 5.0},
-    { "celeron_mendocino", 366666666, 5.5},
-    { "celeron_mendocino", 400000000, 6.0},
-    { "celeron_mendocino", 433333333, 6.5},
-    { "celeron_mendocino", 466666666, 7.0},
-    { "celeron_mendocino", 500000000, 7.5},
-    { "celeron_mendocino", 533333333, 8.0},
-    { NULL,                0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_PentiumIID[] = {
-    {"pentium2_deschutes",  50000000,  1.0},
-    { "pentium2_deschutes", 60000000,  1.0},
-    { "pentium2_deschutes", 66666666,  1.0},
-    { "pentium2_deschutes", 75000000,  1.5},
-    { "pentium2_deschutes", 266666666, 4.0},
-    { "pentium2_deschutes", 300000000, 4.5},
-    { "pentium2_deschutes", 333333333, 5.0},
-    { "pentium2_deschutes", 350000000, 3.5},
-    { "pentium2_deschutes", 400000000, 4.0},
-    { "pentium2_deschutes", 450000000, 4.5},
-    { NULL,                 0,         0  }
-};
-
-static const cpu_legacy_table_t cpus_Cyrix3[] = {
-    {"c3_samuel",  66666666,  1.0},
-    { "c3_samuel", 233333333, 3.5},
-    { "c3_samuel", 266666666, 4.0},
-    { "c3_samuel", 300000000, 4.5},
-    { "c3_samuel", 333333333, 5.0},
-    { "c3_samuel", 350000000, 3.5},
-    { "c3_samuel", 400000000, 4.0},
-    { "c3_samuel", 450000000, 4.5},
-    { "c3_samuel", 500000000, 5.0},
-    { "c3_samuel", 550000000, 5.5},
-    { "c3_samuel", 600000000, 6.0},
-    { "c3_samuel", 650000000, 6.5},
-    { "c3_samuel", 700000000, 7.0},
-    { NULL,        0,         0  }
-};
-
-static const cpu_legacy_table_t *cputables_8088[4]                                = { cpus_8088 };
-static const cpu_legacy_table_t *cputables_pcjr[4]                                = { cpus_pcjr };
-static const cpu_legacy_table_t *cputables_europc[4]                              = { cpus_europc };
-static const cpu_legacy_table_t *cputables_pc1512[4]                              = { cpus_pc1512 };
-static const cpu_legacy_table_t *cputables_8086[4]                                = { cpus_8086 };
-static const cpu_legacy_table_t *cputables_286[4]                                 = { cpus_286 };
-static const cpu_legacy_table_t *cputables_ibmat[4]                               = { cpus_ibmat };
-static const cpu_legacy_table_t *cputables_ps1_m2011[4]                           = { cpus_ps1_m2011 };
-static const cpu_legacy_table_t *cputables_ps2_m30_286_IBM486SLC[4]               = { cpus_ps2_m30_286, cpus_IBM486SLC };
-static const cpu_legacy_table_t *cputables_ibmxt286[4]                            = { cpus_ibmxt286 };
-static const cpu_legacy_table_t *cputables_i386SX_Am386SX_486SLC[4]               = { cpus_i386SX, cpus_Am386SX, cpus_486SLC };
-static const cpu_legacy_table_t *cputables_ALiM6117[4]                            = { cpus_ALiM6117 };
-static const cpu_legacy_table_t *cputables_i386SX_Am386SX_486SLC_IBM486SLC[4]     = { cpus_i386SX, cpus_Am386SX, cpus_486SLC, cpus_IBM486SLC };
-static const cpu_legacy_table_t *cputables_i386DX_Am386DX_486DLC[4]               = { cpus_i386DX, cpus_Am386DX, cpus_486DLC };
-static const cpu_legacy_table_t *cputables_i386DX_Am386DX_486DLC_IBM486BL[4]      = { cpus_i386DX, cpus_Am386DX, cpus_486DLC, cpus_IBM486BL };
-static const cpu_legacy_table_t *cputables_i486_Am486_Cx486[4]                    = { cpus_i486, cpus_Am486, cpus_Cx486 };
-static const cpu_legacy_table_t *cputables_i486S1_Am486S1_Cx486S1[4]              = { cpus_i486S1, cpus_Am486S1, cpus_Cx486S1 };
-static const cpu_legacy_table_t *cputables_IBM486SLC[4]                           = { cpus_IBM486SLC };
-static const cpu_legacy_table_t *cputables_i486_PC330[4]                          = { cpus_i486_PC330 };
-static const cpu_legacy_table_t *cputables_STPCDX[4]                              = { cpus_STPCDX };
-static const cpu_legacy_table_t *cputables_STPCDX2[4]                             = { cpus_STPCDX2 };
-static const cpu_legacy_table_t *cputables_Pentium5V[4]                           = { cpus_Pentium5V };
-static const cpu_legacy_table_t *cputables_PentiumS5_WinChip_K5[4]                = { cpus_PentiumS5, cpus_WinChip, cpus_K5 };
-static const cpu_legacy_table_t *cputables_Pentium3V_WinChip_K5_6x863V[4]         = { cpus_Pentium3V, cpus_WinChip, cpus_K5, cpus_6x863V };
-static const cpu_legacy_table_t *cputables_Pentium3V_K5[4]                        = { cpus_Pentium3V, cpus_K5 };
-static const cpu_legacy_table_t *cputables_Pentium_WinChip_K56_6x86[4]            = { cpus_Pentium, cpus_WinChip, cpus_K56, cpus_6x86 };
-static const cpu_legacy_table_t *cputables_Pentium_WinChip_SS7_K56_SS7_6x86SS7[4] = { cpus_Pentium, cpus_WinChip_SS7, cpus_K56_SS7, cpus_6x86SS7 };
-static const cpu_legacy_table_t *cputables_PentiumPro[4]                          = { cpus_PentiumPro };
-static const cpu_legacy_table_t *cputables_PentiumII66[4]                         = { cpus_PentiumII66 };
-static const cpu_legacy_table_t *cputables_PentiumII_Celeron_Cyrix3[4]            = { cpus_PentiumII, cpus_Celeron, cpus_Cyrix3 };
-static const cpu_legacy_table_t *cputables_Xeon[4]                                = { cpus_Xeon };
-static const cpu_legacy_table_t *cputables_Celeron_Cyrix3[4]                      = { cpus_Celeron, cpus_Cyrix3 };
-static const cpu_legacy_table_t *cputables_Celeron[4]                             = { cpus_Celeron };
-static const cpu_legacy_table_t *cputables_PentiumIID_Celeron[4]                  = { cpus_PentiumIID, cpus_Celeron };
-
-const cpu_legacy_machine_t cpu_legacy_table[] = {
-    {"ibmpc",              cputables_8088                               },
-    { "ibmpc82",           cputables_8088                               },
-    { "ibmpcjr",           cputables_pcjr                               },
-    { "ibmxt",             cputables_8088                               },
-    { "ibmxt86",           cputables_8088                               },
-    { "americxt",          cputables_8088                               },
-    { "amixt",             cputables_8088                               },
-    { "portable",          cputables_8088                               },
-    { "dtk",               cputables_8088                               },
-    { "genxt",             cputables_8088                               },
-    { "jukopc",            cputables_8088                               },
-    { "openxt",            cputables_8088                               },
-    { "pxxt",              cputables_8088                               },
-    { "europc",            cputables_europc                             },
-    { "tandy",             cputables_europc                             },
-    { "tandy1000hx",       cputables_europc                             },
-    { "t1000",             cputables_8088                               },
-    { "ltxt",              cputables_8088                               },
-    { "xi8088",            cputables_8088                               },
-    { "zdsupers",          cputables_8088                               },
-    { "pc1512",            cputables_pc1512                             },
-    { "pc1640",            cputables_8086                               },
-    { "pc2086",            cputables_8086                               },
-    { "pc3086",            cputables_8086                               },
-    { "pc200",             cputables_8086                               },
-    { "ppc512",            cputables_8086                               },
-    { "deskpro",           cputables_8086                               },
-    { "m24",               cputables_8086                               },
-    { "iskra3104",         cputables_8086                               },
-    { "tandy1000sl2",      cputables_8086                               },
-    { "t1200",             cputables_8086                               },
-    { "lxt3",              cputables_8086                               },
-    { "hed919",            cputables_286                                },
-    { "ibmat",             cputables_ibmat                              },
-    { "ibmps1es",          cputables_ps1_m2011                          },
-    { "ibmps2_m30_286",    cputables_ps2_m30_286_IBM486SLC              },
-    { "ibmxt286",          cputables_ibmxt286                           },
-    { "ibmatami",          cputables_ibmat                              },
-    { "cmdpc30",           cputables_286                                },
-    { "portableii",        cputables_286                                },
-    { "portableiii",       cputables_286                                },
-    { "mr286",             cputables_286                                },
-    { "open_at",           cputables_286                                },
-    { "ibmatpx",           cputables_ibmat                              },
-    { "ibmatquadtel",      cputables_ibmat                              },
-    { "siemens",           cputables_286                                },
-    { "t3100e",            cputables_286                                },
-    { "quadt286",          cputables_286                                },
-    { "tg286m",            cputables_286                                },
-    { "ami286",            cputables_286                                },
-    { "px286",             cputables_286                                },
-    { "award286",          cputables_286                                },
-    { "gw286ct",           cputables_286                                },
-    { "gdc212m",           cputables_286                                },
-    { "super286c",         cputables_286                                },
-    { "super286tr",        cputables_286                                },
-    { "spc4200p",          cputables_286                                },
-    { "spc4216p",          cputables_286                                },
-    { "deskmaster286",     cputables_286                                },
-    { "ibmps2_m50",        cputables_ps2_m30_286_IBM486SLC              },
-    { "ibmps1_2121",       cputables_i386SX_Am386SX_486SLC              },
-    { "ibmps1_2121_isa",   cputables_i386SX_Am386SX_486SLC              },
-    { "arb1375",           cputables_ALiM6117                           },
-    { "pja511m",           cputables_ALiM6117                           },
-    { "ama932j",           cputables_i386SX_Am386SX_486SLC              },
-    { "adi386sx",          cputables_i386SX_Am386SX_486SLC              },
-    { "shuttle386sx",      cputables_i386SX_Am386SX_486SLC              },
-    { "dtk386",            cputables_i386SX_Am386SX_486SLC              },
-    { "awardsx",           cputables_i386SX_Am386SX_486SLC              },
-    { "cmdsl386sx25",      cputables_i386SX_Am386SX_486SLC              },
-    { "kmxc02",            cputables_i386SX_Am386SX_486SLC              },
-    { "megapc",            cputables_i386SX_Am386SX_486SLC              },
-    { "ibmps2_m55sx",      cputables_i386SX_Am386SX_486SLC_IBM486SLC    },
-    { "acc386",            cputables_i386DX_Am386DX_486DLC              },
-    { "ecs386",            cputables_i386DX_Am386DX_486DLC              },
-    { "portableiii386",    cputables_i386DX_Am386DX_486DLC              },
-    { "micronics386",      cputables_i386DX_Am386DX_486DLC              },
-    { "asus386",           cputables_i386DX_Am386DX_486DLC              },
-    { "ustechnologies386", cputables_i386DX_Am386DX_486DLC              },
-    { "award386dx",        cputables_i386DX_Am386DX_486DLC              },
-    { "ibmps2_m70_type3",  cputables_i386DX_Am386DX_486DLC_IBM486BL     },
-    { "ibmps2_m80",        cputables_i386DX_Am386DX_486DLC_IBM486BL     },
-    { "pb410a",            cputables_i486_Am486_Cx486                   },
-    { "acera1g",           cputables_i486_Am486_Cx486                   },
-    { "win486",            cputables_i486_Am486_Cx486                   },
-    { "ali1429",           cputables_i486S1_Am486S1_Cx486S1             },
-    { "cs4031",            cputables_i486S1_Am486S1_Cx486S1             },
-    { "rycleopardlx",      cputables_IBM486SLC                          },
-    { "award486",          cputables_i486S1_Am486S1_Cx486S1             },
-    { "ami486",            cputables_i486S1_Am486S1_Cx486S1             },
-    { "mr486",             cputables_i486_Am486_Cx486                   },
-    { "pc330_6571",        cputables_i486_PC330                         },
-    { "403tg",             cputables_i486_Am486_Cx486                   },
-    { "sis401",            cputables_i486_Am486_Cx486                   },
-    { "valuepoint433",     cputables_i486_Am486_Cx486                   },
-    { "ami471",            cputables_i486_Am486_Cx486                   },
-    { "win471",            cputables_i486_Am486_Cx486                   },
-    { "vi15g",             cputables_i486_Am486_Cx486                   },
-    { "vli486sv2g",        cputables_i486_Am486_Cx486                   },
-    { "dtk486",            cputables_i486_Am486_Cx486                   },
-    { "px471",             cputables_i486_Am486_Cx486                   },
-    { "486vchd",           cputables_i486S1_Am486S1_Cx486S1             },
-    { "ibmps1_2133",       cputables_i486S1_Am486S1_Cx486S1             },
-    { "vect486vl",         cputables_i486S1_Am486S1_Cx486S1             },
-    { "ibmps2_m70_type4",  cputables_i486S1_Am486S1_Cx486S1             },
-    { "abpb4",             cputables_i486_Am486_Cx486                   },
-    { "486ap4",            cputables_i486_Am486_Cx486                   },
-    { "486sp3g",           cputables_i486_Am486_Cx486                   },
-    { "alfredo",           cputables_i486_Am486_Cx486                   },
-    { "ls486e",            cputables_i486_Am486_Cx486                   },
-    { "m4li",              cputables_i486_Am486_Cx486                   },
-    { "r418",              cputables_i486_Am486_Cx486                   },
-    { "4sa2",              cputables_i486_Am486_Cx486                   },
-    { "4dps",              cputables_i486_Am486_Cx486                   },
-    { "itoxstar",          cputables_STPCDX                             },
-    { "arb1479",           cputables_STPCDX2                            },
-    { "pcm9340",           cputables_STPCDX2                            },
-    { "pcm5330",           cputables_STPCDX2                            },
-    { "486vipio2",         cputables_i486_Am486_Cx486                   },
-    { "p5mp3",             cputables_Pentium5V                          },
-    { "dellxp60",          cputables_Pentium5V                          },
-    { "opti560l",          cputables_Pentium5V                          },
-    { "ambradp60",         cputables_Pentium5V                          },
-    { "valuepointp60",     cputables_Pentium5V                          },
-    { "revenge",           cputables_Pentium5V                          },
-    { "586mc1",            cputables_Pentium5V                          },
-    { "pb520r",            cputables_Pentium5V                          },
-    { "excalibur",         cputables_Pentium5V                          },
-    { "plato",             cputables_PentiumS5_WinChip_K5               },
-    { "ambradp90",         cputables_PentiumS5_WinChip_K5               },
-    { "430nx",             cputables_PentiumS5_WinChip_K5               },
-    { "acerv30",           cputables_PentiumS5_WinChip_K5               },
-    { "apollo",            cputables_PentiumS5_WinChip_K5               },
-    { "vectra54",          cputables_PentiumS5_WinChip_K5               },
-    { "zappa",             cputables_PentiumS5_WinChip_K5               },
-    { "powermate_v",       cputables_PentiumS5_WinChip_K5               },
-    { "mb500n",            cputables_PentiumS5_WinChip_K5               },
-    { "p54tp4xe",          cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "mr586",             cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "gw2katx",           cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "thor",              cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "mrthor",            cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "endeavor",          cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "pb640",             cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "chariot",           cputables_Pentium3V_K5                       },
-    { "acerm3a",           cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "ap53",              cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "8500tuc",           cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "p55t2s",            cputables_Pentium3V_WinChip_K5_6x863V        },
-    { "acerv35n",          cputables_Pentium_WinChip_K56_6x86           },
-    { "p55t2p4",           cputables_Pentium_WinChip_K56_6x86           },
-    { "m7shi",             cputables_Pentium_WinChip_K56_6x86           },
-    { "tc430hx",           cputables_Pentium_WinChip_K56_6x86           },
-    { "equium5200",        cputables_Pentium_WinChip_K56_6x86           },
-    { "pcv240",            cputables_Pentium_WinChip_K56_6x86           },
-    { "p65up5_cp55t2d",    cputables_Pentium_WinChip_K56_6x86           },
-    { "p55tvp4",           cputables_Pentium_WinChip_K56_6x86           },
-    { "8500tvxa",          cputables_Pentium_WinChip_K56_6x86           },
-    { "presario4500",      cputables_Pentium_WinChip_K56_6x86           },
-    { "p55va",             cputables_Pentium_WinChip_K56_6x86           },
-    { "gw2kte",            cputables_Pentium_WinChip_K56_6x86           },
-    { "brio80xx",          cputables_Pentium_WinChip_K56_6x86           },
-    { "pb680",             cputables_Pentium_WinChip_K56_6x86           },
-    { "430vx",             cputables_Pentium_WinChip_K56_6x86           },
-    { "nupro592",          cputables_Pentium_WinChip_K56_6x86           },
-    { "tx97",              cputables_Pentium_WinChip_K56_6x86           },
-    { "an430tx",           cputables_Pentium_WinChip_K56_6x86           },
-    { "ym430tx",           cputables_Pentium_WinChip_K56_6x86           },
-    { "mb540n",            cputables_Pentium_WinChip_K56_6x86           },
-    { "p5mms98",           cputables_Pentium_WinChip_K56_6x86           },
-    { "ficva502",          cputables_Pentium_WinChip_K56_6x86           },
-    { "ficpa2012",         cputables_Pentium_WinChip_K56_6x86           },
-    { "ax59pro",           cputables_Pentium_WinChip_SS7_K56_SS7_6x86SS7},
-    { "ficva503p",         cputables_Pentium_WinChip_SS7_K56_SS7_6x86SS7},
-    { "ficva503a",         cputables_Pentium_WinChip_SS7_K56_SS7_6x86SS7},
-    { "v60n",              cputables_PentiumPro                         },
-    { "p65up5_cp6nd",      cputables_PentiumPro                         },
-    { "8600ttc",           cputables_PentiumPro                         },
-    { "686nx",             cputables_PentiumPro                         },
-    { "ap440fx",           cputables_PentiumPro                         },
-    { "vs440fx",           cputables_PentiumPro                         },
-    { "m6mi",              cputables_PentiumPro                         },
-    { "mb600n",            cputables_PentiumPro                         },
-    { "p65up5_cpknd",      cputables_PentiumII66                        },
-    { "kn97",              cputables_PentiumII66                        },
-    { "lx6",               cputables_PentiumII66                        },
-    { "spitfire",          cputables_PentiumII66                        },
-    { "p6i440e2",          cputables_PentiumII66                        },
-    { "p2bls",             cputables_PentiumII_Celeron_Cyrix3           },
-    { "p3bf",              cputables_PentiumII_Celeron_Cyrix3           },
-    { "bf6",               cputables_PentiumII_Celeron_Cyrix3           },
-    { "ax6bc",             cputables_PentiumII_Celeron_Cyrix3           },
-    { "atc6310bxii",       cputables_PentiumII_Celeron_Cyrix3           },
-    { "686bx",             cputables_PentiumII_Celeron_Cyrix3           },
-    { "tsunamiatx",        cputables_PentiumII_Celeron_Cyrix3           },
-    { "p6sba",             cputables_PentiumII_Celeron_Cyrix3           },
-    { "ergox365",          cputables_PentiumII_Celeron_Cyrix3           },
-    { "ficka6130",         cputables_PentiumII_Celeron_Cyrix3           },
-    { "6gxu",              cputables_Xeon                               },
-    { "fw6400gx",          cputables_Xeon                               },
-    { "s2dge",             cputables_Xeon                               },
-    { "s370slm",           cputables_Celeron_Cyrix3                     },
-    { "awo671r",           cputables_Celeron_Cyrix3                     },
-    { "cubx",              cputables_Celeron_Cyrix3                     },
-    { "atc7020bxii",       cputables_Celeron_Cyrix3                     },
-    { "ambx133",           cputables_Celeron_Cyrix3                     },
-    { "trinity371",        cputables_Celeron                            },
-    { "63a",               cputables_Celeron_Cyrix3                     },
-    { "apas3",             cputables_Celeron_Cyrix3                     },
-    { "wcf681",            cputables_Celeron_Cyrix3                     },
-    { "6via90ap",          cputables_Celeron_Cyrix3                     },
-    { "p6bap",             cputables_Celeron_Cyrix3                     },
-    { "603tcf",            cputables_Celeron_Cyrix3                     },
-    { "vpc2007",           cputables_PentiumIID_Celeron                 },
-    { NULL,                NULL                                         }
-};
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index b45a7471c..5e864fbb8 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -8764,7 +8764,7 @@ const machine_t machines[] = {
     /* Has AMI MegaKey 'H' KBC firmware. */
     {
         .name = "[i430LX] Gigabyte GA-586IS",
-        .internal_name = "586mc1",
+        .internal_name = "586is",
         .type = MACHINE_TYPE_SOCKET4,
         .chipset = MACHINE_CHIPSET_INTEL_430LX,
         .init = machine_at_586is_init,