diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index 3b7eaeb3f..007868ee3 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -3092,6 +3092,7 @@ cdrom_hard_reset(void)
             dev->is_chinon  = !strcmp(vendor, "CHINON");
             dev->is_pioneer = !strcmp(vendor, "PIONEER");
             dev->is_plextor = !strcmp(vendor, "PLEXTOR");
+            dev->is_yamaha  = !strcmp(vendor, "YAMAHA");
             dev->is_sony    = (dev->bus_type == CDROM_BUS_SCSI) &&
                               (!strcmp(vendor, "DEC") ||
                                !strcmp(vendor, "ShinaKen") ||
diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h
index 85e5a0f0b..655128658 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -184,6 +184,7 @@ static const struct cdrom_drive_types_s {
     { "TOSHIBA",  "CD-ROM XM-6402B",  "1008", "toshiba_6402b",  BUS_TYPE_IDE,  0, 32, 96, 0, 0, {  4,  2,  2,  2 } },
     { "TOSHIBA",  "CD-ROM XM-6702B",  "1007", "toshiba_6720b",  BUS_TYPE_IDE,  0, 48, 96, 0, 0, {  4,  2,  2,  2 } },
     { "TOSHIBA",  "DVD-ROM SD-M1802", "1051", "toshiba_m1802",  BUS_TYPE_IDE,  0, 48, 96, 0, 1, {  4,  2,  2,  2 } },
+    { "YAMAHA",   "CRW8424E",         "1.0g", "yamaha_crw8424", BUS_TYPE_IDE,  0, 24, 36, 0, 0, {  4,  2,  2, -1 } },
     { "CHINON",   "CD-ROM CDS-431",   "H42 ", "chinon_431",     BUS_TYPE_SCSI, 1,  1, 36, 1, 0, { -1, -1, -1, -1 } },
     { "CHINON",   "CD-ROM CDX-435",   "M62 ", "chinon_435",     BUS_TYPE_SCSI, 1,  2, 36, 1, 0, { -1, -1, -1, -1 } },
     { "DEC",      "RRD45   (C) DEC",  "0436", "dec_45",         BUS_TYPE_SCSI, 1,  4, 36, 0, 0, { -1, -1, -1, -1 } },
@@ -359,6 +360,7 @@ typedef struct cdrom {
     int32_t            is_plextor;
     int32_t            is_sony;
     int32_t            is_toshiba;
+    int32_t            is_yamaha;
 
     int32_t            c2_first;
     int32_t            cur_buf;