diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index a1cf1ff45..26414ae4e 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -270,6 +270,7 @@ extern int	machine_at_430nx_init(const machine_t *);
 extern int	machine_at_p54tp4xe_init(const machine_t *);
 extern int	machine_at_endeavor_init(const machine_t *);
 extern int	machine_at_zappa_init(const machine_t *);
+extern int	machine_at_gw2kzp_init(const machine_t *);
 extern int	machine_at_mb500n_init(const machine_t *);
 #if defined(DEV_BRANCH) && defined(USE_VECTRA54)
 extern int	machine_at_vectra54_init(const machine_t *);
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index 0567a5d1a..2cf67a6d6 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -342,6 +342,35 @@ machine_at_zappa_init(const machine_t *model)
 }
 
 
+int
+machine_at_gw2kzp_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear_combined(L"roms/machines/gw2k_zp/1011bs0t.bio",
+				    L"roms/machines/gw2k_zp/1011bs0t.bi1", 0x20000, 128);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_common_init(model);
+
+    pci_init(PCI_CONFIG_TYPE_1);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 3, 4, 1);
+    pci_register_slot(0x0F, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+    device_add(&keyboard_ps2_intel_ami_pci_device);
+    device_add(&i430fx_device);
+    device_add(&piix_device);
+    device_add(&pc87306_device);
+    device_add(&intel_flash_bxt_ami_device);
+
+    return ret;
+}
+
+
 int
 machine_at_mb500n_init(const machine_t *model)
 {
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index edb80a4c5..cc32bad64 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -224,6 +224,7 @@ const machine_t machines[] = {
     { "[Socket 5 NX] Gigabyte GA-586IP",	"430nx",		MACHINE_CPUS_PENTIUM_S5,											    MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  2,  128,   2, 127,		machine_at_430nx_init, NULL			},
 
     /* 430FX */
+    { "[Socket 5 FX] Gateway 2000 Zappa",	"gw2kzp",		MACHINE_CPUS_PENTIUM_S5,											    MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,					  8,  128,   8, 127,	       machine_at_gw2kzp_init, NULL			},
 #if defined(DEV_BRANCH) && defined(USE_VECTRA54)
     { "[Socket 5 FX] HP Vectra VL 5 Series 4",  "vectra54",		MACHINE_CPUS_PENTIUM_S5,											    MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC,						  8,  128,   8, 511,	     machine_at_vectra54_init, NULL			},
 #endif
diff --git a/src/sound/snd_gus.c b/src/sound/snd_gus.c
index 19974cf6a..966044b77 100644
--- a/src/sound/snd_gus.c
+++ b/src/sound/snd_gus.c
@@ -14,7 +14,7 @@
 #include <86box/device.h>
 #include <86box/sound.h>
 #include <86box/midi.h>
-#include <86Box/snd_ad1848.h>
+#include <86box/snd_ad1848.h>
 #include <math.h>
 
 enum