diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index b7702e55b..3b65952a2 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -1382,6 +1382,9 @@ extern const device_t  ps1_hdc_device;
 #endif
 
 /* m_ps2_isa.c */
+#ifdef EMU_DEVICE_H
+extern const device_t  ps2_m30_286_device;
+#endif
 extern int             machine_ps2_m30_286_init(const machine_t *);
 
 /* m_ps2_mca.c */
diff --git a/src/machine/m_ps2_isa.c b/src/machine/m_ps2_isa.c
index 5754eee11..04c4279c8 100644
--- a/src/machine/m_ps2_isa.c
+++ b/src/machine/m_ps2_isa.c
@@ -146,6 +146,58 @@ ps2_read(uint16_t port, void *priv)
     return temp;
 }
 
+static const device_config_t ps2_m30_286_config[] = {
+    // clang-format off
+    {
+        .name           = "bios",
+        .description    = "BIOS Version",
+        .type           = CONFIG_BIOS,
+        .default_string = "ibmps2_m30_286",
+        .default_int    = 0,
+        .file_filter    = NULL,
+        .spinner        = { 0 },
+        .selection      = { { 0 } },
+        .bios           = {
+            {
+                .name          = "Model 30-286 rev. 0 BIOS",
+                .internal_name = "ibmps2_m30_286_rev0",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 131072,
+                .files         = { "roms/machines/ibmps2_m30_286/27F4092.BIN", "" }
+            },
+            {
+                .name          = "Model 30-286 rev. 2 BIOS",
+                .internal_name = "ibmps2_m30_286",
+                .bios_type     = BIOS_NORMAL,
+                .files_no      = 1,
+                .local         = 0,
+                .size          = 131072,
+                .files         = { "roms/machines/ibmps2_m30_286/33f5381a.bin", "" }
+            },
+            { .files_no = 0 }
+        }
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+    // clang-format on
+};
+
+const device_t ps2_m30_286_device = {
+    .name          = "IBM PS/2 model 30-286",
+    .internal_name = "ps2_m30_286_device",
+    .flags         = 0,
+    .local         = 0,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    .available     = NULL,
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = ps2_m30_286_config
+};
+
+
 static void
 ps2_isa_setup(int model, int cpu_type)
 {
@@ -208,14 +260,18 @@ ps2_isa_common_init(const machine_t *model)
 int
 machine_ps2_m30_286_init(const machine_t *model)
 {
-    int ret;
+    int         ret = 0;
+    const char *fn;
 
-    ret = bios_load_linear("roms/machines/ibmps2_m30_286/33f5381a.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
+    /* No ROMs available */
+    if (!device_available(model->device))
         return ret;
 
+    device_context(model->device);
+    fn  = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
+    ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
+    device_context_restore();
+
     ps2_isa_common_init(model);
 
     ps2_isa_setup(30, 286);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index c67a22c04..240e2d255 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -3202,7 +3202,7 @@ const machine_t machines[] = {
         .kbc_p1                   = 0x00000cf0,
         .gpio                     = 0xffffffff,
         .gpio_acpi                = 0xffffffff,
-        .device                   = NULL,
+        .device                   = &ps2_m30_286_device,
         .kbd_device               = NULL,
         .fdc_device               = NULL,
         .sio_device               = NULL,