diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 37fffe771..c68108d42 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -81,9 +81,7 @@ enum {
     MACHINE_TYPE_SLOT1,
     MACHINE_TYPE_SLOT2,
     MACHINE_TYPE_SOCKET370,
-#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
     MACHINE_TYPE_MISC,
-#endif
     MACHINE_TYPE_MAX
 };
 
@@ -414,6 +412,7 @@ extern int	machine_at_p65up5_cpknd_init(const machine_t *);
 extern int	machine_at_kn97_init(const machine_t *);
 
 extern int	machine_at_lx6_init(const machine_t *);
+extern int	machine_at_spitfire_init(const machine_t *);
 
 extern int	machine_at_p6i440e2_init(const machine_t *);
 
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index 21a30011b..18893c0c6 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -136,6 +136,52 @@ machine_at_lx6_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_spitfire_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/spitfire/SPIHM.02",
+			   0x000c0000, 262144, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&i440lx_device);
+    device_add(&piix4e_device);
+    device_add(&keyboard_ps2_pci_device);
+    device_add(&fdc37c935_device);
+    device_add(&intel_flash_bxt_device);
+	spd_register(SPD_TYPE_SDRAM, 0xF, 256);
+
+    hwm_values_t machine_hwm = {
+    	{    /* fan speeds (incorrect divisor for some reason) */
+    		6000,	/* Chassis */
+    		6000,	/* CPU */
+    		6000	/* Power */
+    	}, { /* temperatures */
+    		30	/* MB */
+    	}, { /* voltages */
+    		2800,				   /* VCORE (2.8V by default) */
+    		0,				   /* unused */
+    		3300,				   /* +3.3V */
+    		RESISTOR_DIVIDER(5000,   11,  16), /* +5V  (divider values bruteforced) */
+    		RESISTOR_DIVIDER(12000,  28,  10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
+    		RESISTOR_DIVIDER(12000, 853, 347), /* -12V (divider values bruteforced) */
+    		RESISTOR_DIVIDER(5000,    1,   2)  /* -5V  (divider values bruteforced) */
+    	}
+    };
+    hwm_set_values(machine_hwm);
+    device_add(&lm78_device);
+
+    return ret;
+}
+
 int
 machine_at_p6i440e2_init(const machine_t *model)
 {
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index dd3796670..2543c5251 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -81,9 +81,7 @@ const machine_type_t machine_types[] = {
     { "Slot 1",		MACHINE_TYPE_SLOT1	},
     { "Slot 2",		MACHINE_TYPE_SLOT2	},
     { "Socket 370",	MACHINE_TYPE_SOCKET370	},
-#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
     { "Miscellaneous", MACHINE_TYPE_MISC    },
-#endif
 };
 
 
@@ -349,6 +347,7 @@ const machine_t machines[] = {
 
 	/* 440LX */
     { "[i440LX] ABIT LX6",			"lx6",			MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumII66}, {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  8, 1024,   8, 255,	          machine_at_lx6_init, NULL			},
+    { "[i440LX] Micronics Spitfire",			"spitfire",			MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumII66}, {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  8, 1024,   8, 255,	          machine_at_spitfire_init, NULL			},
 
     /* 440EX */
     { "[i440EX] QDI EXCELLENT II",		"p6i440e2",		MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumII66}, {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  8,  512,   8, 255,	     machine_at_p6i440e2_init, NULL			},