diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 7ad34226c..ad2b8d41c 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -317,6 +317,7 @@ extern int	machine_at_s1668_init(const machine_t *);
 /* m_at_slot1.c */
 extern int	machine_at_6bxc_init(const machine_t *);
 extern int  machine_at_p2bls_init(const machine_t *);
+extern int	machine_at_bf6_init(const machine_t *);
 extern int	machine_at_borapro_init(const machine_t *);
 
 /* m_at_socket370.c */
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index 846da824d..0220a699b 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -133,6 +133,40 @@ machine_at_p2bls_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_bf6_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/bf6/Beh_70.bin",
+			   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(0x13, PCI_CARD_NORMAL,      3, 3, 1, 2);
+	pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+	pci_register_slot(0x0F, PCI_CARD_NORMAL,      2, 3, 4, 1);
+	pci_register_slot(0x0D, PCI_CARD_NORMAL,      3, 4, 1, 2);
+	pci_register_slot(0x0B, PCI_CARD_NORMAL,      4, 1, 2, 3);
+	pci_register_slot(0x09, PCI_CARD_NORMAL,      2, 1, 4, 3);
+	pci_register_slot(0x08, PCI_CARD_NORMAL,      3, 4, 1, 2);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);    
+    pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    device_add(&i440bx_device);
+    device_add(&piix4e_device);
+    device_add(&keyboard_ps2_pci_device);
+    device_add(&w83977ef_device);
+    device_add(&sst_flash_39sf020_device);
+    spd_register(SPD_TYPE_SDRAM, 0xF, 256);    
+
+    return ret;
+}
+
 int
 machine_at_borapro_init(const machine_t *model)
 {
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index dd2462b9d..abbe68169 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -245,9 +245,11 @@ const machine_t machines[] = {
 
     { "[Slot 1 BX] Gigabyte GA-6BXC",		"6bxc",			{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			  		  8,  768,   8, 255,		 machine_at_6bxc_init, NULL			},
     { "[Slot 1 BX] ASUS P2B-LS",		"p2bls",		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8, 1024,   8, 255,		machine_at_p2bls_init, NULL			},
+    { "[Slot 1 BX] ABit BF6",		"bf6",		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			  		  8,  768,   8, 255,		machine_at_bf6_init, NULL			},
 #else
     { "[Slot 1 BX] Gigabyte GA-6BXC",		"6bxc",			{{"VIA", cpus_Cyrix3},        {"",    NULL},	     {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  8,  768,   8, 255,		 machine_at_6bxc_init, NULL			},	
     { "[Slot 1 BX] ASUS P2B-LS",		"p2bls",		{{"VIA", cpus_Cyrix3},        {"",    NULL},	     {"",      NULL},        {"",      NULL},     {"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  8, 1024,   8, 255,		machine_at_p2bls_init, NULL			},
+    { "[Slot 1 BX] ABit BF6",		"bf6",		{{"VIA", cpus_Cyrix3},   {"",    NULL},	{"",    NULL},	{"",      NULL},	{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			  		  8,  768,   8, 255,		 machine_at_bf6_init, NULL			},
 #endif
 #if defined(DEV_BRANCH) && defined(USE_I686)
     { "[Slot 1 ZX] Packard Bell Bora Pro",	"borapro",		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8,  512,   8, 255,	      machine_at_borapro_init, NULL		},