diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h
index 7acfa2cc3..bd50604bb 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -71,12 +71,15 @@ enum
     CDROM_TYPE_BTC_BCD36XH_U10,
     CDROM_TYPE_GOLDSTAR_CRD_8160B_314,
     CDROM_TYPE_HITACHI_CDR_8130_0020,
-    CDROM_TYPE_HLDTST_GCE8525B_101,
+    CDROM_TYPE_HITACHI_GD7500_A1,
+    CDROM_TYPE_HLDTST_GCR8526B_101,
     CDROM_TYPE_HLDTST_GSA4160_A302,
     CDROM_TYPE_KENWOOD_UCR_421_208E,
     CDROM_TYPE_LG_CRN8245B_130,
+    CDROM_TYPE_LG_CRD8322B_106,
     CDROM_TYPE_LTN48125S_1S07,
     CDROM_TYPE_LTN526D_YSR5,
+    CDROM_TYPE_MATSHITA_583_107,
     CDROM_TYPE_MATSHITA_585_Z18P,
     CDROM_TYPE_MATSHITA_587_7S13,
     CDROM_TYPE_MATSHITA_588_LS15,
@@ -98,6 +101,8 @@ enum
     CDROM_TYPE_TEAC_CD532E_20A,
     CDROM_TYPE_TOSHIBA_5302TA_0305,
     CDROM_TYPE_TOSHIBA_5702B_TA70,
+    CDROM_TYPE_TOSHIBA_6202B_1512,
+    CDROM_TYPE_TOSHIBA_6402B_1008,
     CDROM_TYPE_TOSHIBA_6702B_1007,
     CDROM_TYPE_TOSHIBA_M1802_1051,
     CDROM_TYPE_CHINON_CDS431_H42,
@@ -144,42 +149,47 @@ static const struct
     const char *internal_name;
     const int   bus_type;
 } cdrom_drive_types[] = {
-    { "86BOX",    "CD-ROM",             "1.00", "86BOX CD-ROM 1.00",             "86BOX_CD-ROM_1.00",             BUS_TYPE_BOTH  },
-    { "ASUS",     "CD-S500/A",          "1.41", "ASUS CD-S500/A 1.41",           "ASUS_CD-S500A_1.41",            BUS_TYPE_IDE  },
-    { "ASUS",     "CD-S520/A4",         "1.32", "ASUS CD-S520/A4 1.32",          "ASUS_CD-S520A4_1.32",           BUS_TYPE_IDE  },
-    { "AZT",      "CDA46802I",          "1.15", "AZT CDA46802I 1.15",            "AZT_CDA46802I_1.15",            BUS_TYPE_IDE  },
-    { "BTC",      "CD-ROM BCD36XH",     "U1.0", "BTC CD-ROM BCD36XH U1.0",       "BTC_CD-ROM_BCD36XH_U1.0",       BUS_TYPE_IDE  },
-    { "GOLDSTAR", "CRD-8160B",          "3.14", "GOLDSTAR CRD-8160B 3.14",       "GOLDSTAR_CRD-8160B_3.14",       BUS_TYPE_IDE  },
-    { "HITACHI",  "CDR-8130",           "0020", "HITACHI CDR-8130 0020",         "HITACHI_CDR-8130_0020",         BUS_TYPE_IDE  },
-    { "HL-DT-ST", "GCE-8525B",          "1.01", "HL-DT-ST GCE-8525B 1.01",       "HL-DT-ST_GCE-8525B_1.01",       BUS_TYPE_IDE  },
-    { "HL-DT-ST", "DVDRAM GSA-4160",    "A302", "HL-DT-ST DVDRAM GSA-4160 A302", "HL-DT-ST_DVDRAM_GSA-4160_A302", BUS_TYPE_IDE  },
-    { "KENWOOD",  "CD-ROM UCR-421",     "208E", "KENWOOD CD-ROM UCR-421 208E",   "KENWOOD_CD-ROM_UCR-421_208E",   BUS_TYPE_IDE  },
-    { "LG",       "CD-ROM CRN-8245B",   "1.30", "LG CD-ROM CRN-8245B 1.30",      "LG_CD-ROM_CRN-8245B_1.30",      BUS_TYPE_IDE  },
-    { "LITE-ON",  "LTN48125S",          "1S07", "LITE-ON LTN48125S 1S07",        "LITE-ON_LTN48125S_1S07",        BUS_TYPE_IDE  },
-    { "LITE-ON",  "LTN526D",            "YSR5", "LITE-ON LTN526D YSR5",          "LITE-ON_LTN526D_YSR5",          BUS_TYPE_IDE  },
-    { "MATSHITA", "CD-ROM CR-585",      "Z18P", "MATSHITA CD-ROM CR-585 Z18P",   "MATSHITA_CD-ROM_CR-585_Z18P",   BUS_TYPE_IDE  },
-    { "MATSHITA", "CD-ROM CR-587",      "7S13", "MATSHITA CD-ROM CR-587 7S13",   "MATSHITA_CD-ROM_CR-587_7S13",   BUS_TYPE_IDE  },
-    { "MATSHITA", "CD-ROM CR-588",      "LS15", "MATSHITA CD-ROM CR-588 LS15",   "MATSHITA_CD-ROM_CR-588_LS15",   BUS_TYPE_IDE  },
-    { "MATSHITA", "CR-571",             "1.0e", "MATSHITA CR-571 1.0e",          "MATSHITA_CR-571_1.0e",          BUS_TYPE_IDE  },
-    { "MATSHITA", "CR-572",             "1.0j", "MATSHITA CR-572 1.0j",          "MATSHITA_CR-572_1.0j",          BUS_TYPE_IDE  },
-    { "MITSUMI",  "CRMC-FX4820T",       "D02A", "MITSUMI CRMC-FX4820T D02A",     "MITSUMI_CRMC-FX4820T_D02A",     BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:260",   "1.00", "NEC CD-ROM DRIVE:260 1.00",     "NEC_CD-ROM_DRIVE260_1.00",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:260",   "1.01", "NEC CD-ROM DRIVE:260 1.01",     "NEC_CD-ROM_DRIVE260_1.01",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:273",   "4.20", "NEC CD-ROM DRIVE:273 4.20",     "NEC_CD-ROM_DRIVE273_4.20",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:280",   "1.05", "NEC CD-ROM DRIVE:280 1.05",     "NEC_CD-ROM_DRIVE280_1.05",      BUS_TYPE_IDE  },
-    { "NEC",      "CD-ROM DRIVE:280",   "3.08", "NEC CD-ROM DRIVE:280 3.08",     "NEC_CD-ROM_DRIVE280_3.08",      BUS_TYPE_IDE  },
-    { "NEC",      "CDR-1900A",          "1.00", "NEC CDR-1900A 1.00",            "NEC_CDR-1900A_1.00",            BUS_TYPE_IDE  },
-    { "PHILIPS",  "CD-ROM PCA403CD",    "U31P", "PHILIPS CD-ROM PCA403CD U31P",  "PHILIPS_CD-ROM_PCA403CD_U31P",  BUS_TYPE_IDE  },
-    { "SONY",     "CD-ROM CDU76",       "1.0i", "SONY CD-ROM CDU76 1.0i",        "SONY_CD-ROM_CDU76_1.0i",        BUS_TYPE_IDE  },
-    { "SONY",     "CD-ROM CDU311",      "3.0h", "SONY CD-ROM CDU311 3.0h",       "SONY_CD-ROM_CDU311_3.0h",       BUS_TYPE_IDE  },
-    { "SONY",     "CD-ROM CDU5225",     "NYS4", "SONY CD-ROM CDU5225 NYS4",      "SONY_CD-ROM_CDU5225_NYS4",      BUS_TYPE_IDE  },
-    { "TEAC",     "CD-516E",            "1.0G", "TEAC CD-516E 1.0G",             "TEAC_CD-516E_1.0G",             BUS_TYPE_IDE  },
-    { "TEAC",     "CD-524EA",           "3.0D", "TEAC CD-524EA 3.0D",            "TEAC_CD-524EA_3.0D",            BUS_TYPE_IDE  },
-    { "TEAC",     "CD-532E",            "2.0A", "TEAC CD-532E 2.0A",             "TEAC_CD_532E_2.0A",             BUS_TYPE_IDE  },
-    { "TOSHIBA",  "CD-ROM XM-5302TA",   "0305", "TOSHIBA CD-ROM XM-5302TA 0305", "TOSHIBA_CD-ROM_XM-5302TA_0305", BUS_TYPE_IDE  },
-    { "TOSHIBA",  "CD-ROM XM-5702B",    "TA70", "TOSHIBA CD-ROM XM-5702B TA70",  "TOSHIBA_CD-ROM_XM-5702B_TA70",  BUS_TYPE_IDE  },
-    { "TOSHIBA",  "CD-ROM XM-6702B",    "1007", "TOSHIBA CD-ROM XM-6702B 1007",  "TOSHIBA_CD-ROM_XM-6702B_1007",  BUS_TYPE_IDE  },
-    { "TOSHIBA",  "DVD-ROM SD-M1802",   "1051", "TOSHIBA DVD-ROM SD-M1802 1051", "TOSHIBA_DVD-ROM_SD-M1802_1051", BUS_TYPE_IDE  },
+    { "86BOX",    "CD-ROM",             "1.00", "86BOX CD-ROM 1.00",              "86BOX_CD-ROM_1.00",              BUS_TYPE_BOTH  },
+    { "ASUS",     "CD-S500/A",          "1.41", "ASUS CD-S500/A 1.41",            "ASUS_CD-S500A_1.41",             BUS_TYPE_IDE  },
+    { "ASUS",     "CD-S520/A4",         "1.32", "ASUS CD-S520/A4 1.32",           "ASUS_CD-S520A4_1.32",            BUS_TYPE_IDE  },
+    { "AZT",      "CDA46802I",          "1.15", "AZT CDA46802I 1.15",             "AZT_CDA46802I_1.15",             BUS_TYPE_IDE  },
+    { "BTC",      "CD-ROM BCD36XH",     "U1.0", "BTC CD-ROM BCD36XH U1.0",        "BTC_CD-ROM_BCD36XH_U1.0",        BUS_TYPE_IDE  },
+    { "GOLDSTAR", "CRD-8160B",          "3.14", "GOLDSTAR CRD-8160B 3.14",        "GOLDSTAR_CRD-8160B_3.14",        BUS_TYPE_IDE  },
+    { "HITACHI",  "CDR-8130",           "0020", "HITACHI CDR-8130 0020",          "HITACHI_CDR-8130_0020",          BUS_TYPE_IDE  },
+    { "HITACHI",  "GD-7500",            "A1  ", "HITACHI GD-7500 A1",             "HITACHI_GD-7500_A1",             BUS_TYPE_IDE  },
+    { "HL-DT-ST", "CD-ROM GCR-8526B",   "1.01", "HL-DT-ST CD-ROM GCR-8526B 1.01", "HL-DT-ST_CD-ROM_GCR-8526B_1.01", BUS_TYPE_IDE  },
+    { "HL-DT-ST", "DVDRAM GSA-4160",    "A302", "HL-DT-ST DVDRAM GSA-4160 A302",  "HL-DT-ST_DVDRAM_GSA-4160_A302",  BUS_TYPE_IDE  },
+    { "KENWOOD",  "CD-ROM UCR-421",     "208E", "KENWOOD CD-ROM UCR-421 208E",    "KENWOOD_CD-ROM_UCR-421_208E",    BUS_TYPE_IDE  },
+    { "LG",       "CD-ROM CRN-8245B",   "1.30", "LG CD-ROM CRN-8245B 1.30",       "LG_CD-ROM_CRN-8245B_1.30",       BUS_TYPE_IDE  },
+    { "LG",       "CD-ROM CRD-8322B",   "1.06", "LG CD-ROM CRD-8322B 1.06",       "LG_CD-ROM_CRD-8322B_1.06",       BUS_TYPE_IDE  },
+    { "LITE-ON",  "LTN48125S",          "1S07", "LITE-ON LTN48125S 1S07",         "LITE-ON_LTN48125S_1S07",         BUS_TYPE_IDE  },
+    { "LITE-ON",  "LTN526D",            "YSR5", "LITE-ON LTN526D YSR5",           "LITE-ON_LTN526D_YSR5",           BUS_TYPE_IDE  },
+    { "MATSHITA", "CD-ROM CR-583",      "1.07", "MATSHITA CD-ROM CR-583 1.07",    "MATSHITA_CD-ROM_CR-583_1.07",    BUS_TYPE_IDE  },
+    { "MATSHITA", "CD-ROM CR-585",      "Z18P", "MATSHITA CD-ROM CR-585 Z18P",    "MATSHITA_CD-ROM_CR-585_Z18P",    BUS_TYPE_IDE  },
+    { "MATSHITA", "CD-ROM CR-587",      "7S13", "MATSHITA CD-ROM CR-587 7S13",    "MATSHITA_CD-ROM_CR-587_7S13",    BUS_TYPE_IDE  },
+    { "MATSHITA", "CD-ROM CR-588",      "LS15", "MATSHITA CD-ROM CR-588 LS15",    "MATSHITA_CD-ROM_CR-588_LS15",    BUS_TYPE_IDE  },
+    { "MATSHITA", "CR-571",             "1.0e", "MATSHITA CR-571 1.0e",           "MATSHITA_CR-571_1.0e",           BUS_TYPE_IDE  },
+    { "MATSHITA", "CR-572",             "1.0j", "MATSHITA CR-572 1.0j",           "MATSHITA_CR-572_1.0j",           BUS_TYPE_IDE  },
+    { "MITSUMI",  "CRMC-FX4820T",       "D02A", "MITSUMI CRMC-FX4820T D02A",      "MITSUMI_CRMC-FX4820T_D02A",      BUS_TYPE_IDE  },
+    { "NEC",      "CD-ROM DRIVE:260",   "1.00", "NEC CD-ROM DRIVE:260 1.00",      "NEC_CD-ROM_DRIVE260_1.00",       BUS_TYPE_IDE  },
+    { "NEC",      "CD-ROM DRIVE:260",   "1.01", "NEC CD-ROM DRIVE:260 1.01",      "NEC_CD-ROM_DRIVE260_1.01",       BUS_TYPE_IDE  },
+    { "NEC",      "CD-ROM DRIVE:273",   "4.20", "NEC CD-ROM DRIVE:273 4.20",      "NEC_CD-ROM_DRIVE273_4.20",       BUS_TYPE_IDE  },
+    { "NEC",      "CD-ROM DRIVE:280",   "1.05", "NEC CD-ROM DRIVE:280 1.05",      "NEC_CD-ROM_DRIVE280_1.05",       BUS_TYPE_IDE  },
+    { "NEC",      "CD-ROM DRIVE:280",   "3.08", "NEC CD-ROM DRIVE:280 3.08",      "NEC_CD-ROM_DRIVE280_3.08",       BUS_TYPE_IDE  },
+    { "NEC",      "CDR-1900A",          "1.00", "NEC CDR-1900A 1.00",             "NEC_CDR-1900A_1.00",             BUS_TYPE_IDE  },
+    { "PHILIPS",  "CD-ROM PCA403CD",    "U31P", "PHILIPS CD-ROM PCA403CD U31P",   "PHILIPS_CD-ROM_PCA403CD_U31P",   BUS_TYPE_IDE  },
+    { "SONY",     "CD-ROM CDU76",       "1.0i", "SONY CD-ROM CDU76 1.0i",         "SONY_CD-ROM_CDU76_1.0i",         BUS_TYPE_IDE  },
+    { "SONY",     "CD-ROM CDU311",      "3.0h", "SONY CD-ROM CDU311 3.0h",        "SONY_CD-ROM_CDU311_3.0h",        BUS_TYPE_IDE  },
+    { "SONY",     "CD-ROM CDU5225",     "NYS4", "SONY CD-ROM CDU5225 NYS4",       "SONY_CD-ROM_CDU5225_NYS4",       BUS_TYPE_IDE  },
+    { "TEAC",     "CD-516E",            "1.0G", "TEAC CD-516E 1.0G",              "TEAC_CD-516E_1.0G",              BUS_TYPE_IDE  },
+    { "TEAC",     "CD-524EA",           "3.0D", "TEAC CD-524EA 3.0D",             "TEAC_CD-524EA_3.0D",             BUS_TYPE_IDE  },
+    { "TEAC",     "CD-532E",            "2.0A", "TEAC CD-532E 2.0A",              "TEAC_CD_532E_2.0A",              BUS_TYPE_IDE  },
+    { "TOSHIBA",  "CD-ROM XM-5302TA",   "0305", "TOSHIBA CD-ROM XM-5302TA 0305", "TOSHIBA_CD-ROM_XM-5302TA_0305",   BUS_TYPE_IDE  },
+    { "TOSHIBA",  "CD-ROM XM-5702B",    "TA70", "TOSHIBA CD-ROM XM-5702B TA70",  "TOSHIBA_CD-ROM_XM-5702B_TA70",    BUS_TYPE_IDE  },
+    { "TOSHIBA",  "CD-ROM XM-6202B",    "1512", "TOSHIBA CD-ROM XM-6202B 1512",  "TOSHIBA_CD-ROM_XM-6202B_1512",    BUS_TYPE_IDE  },
+    { "TOSHIBA",  "CD-ROM XM-6402B",    "1008", "TOSHIBA CD-ROM XM-6402B 1008",  "TOSHIBA_CD-ROM_XM-6402B_1008",    BUS_TYPE_IDE  },
+    { "TOSHIBA",  "CD-ROM XM-6702B",    "1007", "TOSHIBA CD-ROM XM-6702B 1007",  "TOSHIBA_CD-ROM_XM-6702B_1007",    BUS_TYPE_IDE  },
+    { "TOSHIBA",  "DVD-ROM SD-M1802",   "1051", "TOSHIBA DVD-ROM SD-M1802 1051", "TOSHIBA_DVD-ROM_SD-M1802_1051",   BUS_TYPE_IDE  },
     { "CHINON",   "CD-ROM CDS-431",     "H42 ", "[SCSI-1] CHINON CD-ROM CDS-431 H42",       "CHINON_CD-ROM_CDS-431_H42",     BUS_TYPE_SCSI },
     { "CHINON",   "CD-ROM CDX-435",     "M62 ", "[SCSI-1] CHINON CD-ROM CDX-435 M62",       "CHINON_CD-ROM_CDX-435_M62",     BUS_TYPE_SCSI },
     { "DEC",      "RRD45   (C) DEC",    "0436", "[SCSI-1] DEC RRD45 0436",                  "DEC_RRD45_0436",                BUS_TYPE_SCSI },
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index 1eabc59f6..91773c62c 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -4061,9 +4061,13 @@ scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
                 ide_padstr((char *) (ide->buffer + 23), "0020    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "HITACHI CDR-8130                        ", 40); /* Model */
                 break;
-            case CDROM_TYPE_HLDTST_GCE8525B_101:
+            case CDROM_TYPE_HITACHI_GD7500_A1:
+                ide_padstr((char *) (ide->buffer + 23), "A1      ", 8);                                  /* Firmware */
+                ide_padstr((char *) (ide->buffer + 27), "HITACHI GD-7500                         ", 40); /* Model */
+                break;
+            case CDROM_TYPE_HLDTST_GCR8526B_101:
                 ide_padstr((char *) (ide->buffer + 23), "1.01    ", 8);                                  /* Firmware */
-                ide_padstr((char *) (ide->buffer + 27), "HL-DT-ST GCE-8525B                      ", 40); /* Model */
+                ide_padstr((char *) (ide->buffer + 27), "HL-DT-ST CD-ROM GCR-8526B               ", 40); /* Model */
                 break;
             case CDROM_TYPE_HLDTST_GSA4160_A302:
                 ide_padstr((char *) (ide->buffer + 23), "A302    ", 8);                                  /* Firmware */
@@ -4077,6 +4081,10 @@ scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
                 ide_padstr((char *) (ide->buffer + 23), "1.30    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "LG CD-ROM CRN-8245B                     ", 40); /* Model */
                 break;
+            case CDROM_TYPE_LG_CRD8322B_106:
+                ide_padstr((char *) (ide->buffer + 23), "1.06    ", 8);                                  /* Firmware */
+                ide_padstr((char *) (ide->buffer + 27), "LG CD-ROM CRD-8322B                     ", 40); /* Model */
+                break;
             case CDROM_TYPE_LTN48125S_1S07:
                 ide_padstr((char *) (ide->buffer + 23), "1S07    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "LTN48125S                               ", 40); /* Model */
@@ -4085,6 +4093,10 @@ scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
                 ide_padstr((char *) (ide->buffer + 23), "YSR5    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "LTN526D                                 ", 40); /* Model */
                 break;
+            case CDROM_TYPE_MATSHITA_583_107:
+                ide_padstr((char *) (ide->buffer + 23), "1.07    ", 8);                                  /* Firmware */
+                ide_padstr((char *) (ide->buffer + 27), "MATSHITA CD-ROM CR-583                  ", 40); /* Model */
+                break;
             case CDROM_TYPE_MATSHITA_585_Z18P:
                 ide_padstr((char *) (ide->buffer + 23), "Z18P    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "MATSHITA CD-ROM CR-585                  ", 40); /* Model */
@@ -4169,6 +4181,14 @@ scsi_cdrom_identify(ide_t *ide, int ide_has_dma)
                 ide_padstr((char *) (ide->buffer + 23), "TA70    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "TOSHIBA CD-ROM XM-5702B                 ", 40); /* Model */
                 break;
+            case CDROM_TYPE_TOSHIBA_6202B_1512:
+                ide_padstr((char *) (ide->buffer + 23), "1512    ", 8);                                  /* Firmware */
+                ide_padstr((char *) (ide->buffer + 27), "TOSHIBA CD-ROM XM-6202B                 ", 40); /* Model */
+                break;
+            case CDROM_TYPE_TOSHIBA_6402B_1008:
+                ide_padstr((char *) (ide->buffer + 23), "1008    ", 8);                                  /* Firmware */
+                ide_padstr((char *) (ide->buffer + 27), "TOSHIBA CD-ROM XM-6402B                 ", 40); /* Model */
+                break;
             case CDROM_TYPE_TOSHIBA_6702B_1007:
                 ide_padstr((char *) (ide->buffer + 23), "1007    ", 8);                                  /* Firmware */
                 ide_padstr((char *) (ide->buffer + 27), "TOSHIBA CD-ROM XM-6702B                 ", 40); /* Model */