diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c
index a1652cfd1f4..436f7ad791d 100644
--- a/sys/amd64/acpica/madt.c
+++ b/sys/amd64/acpica/madt.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/acpica/madt.h>
 #include <dev/pci/pcivar.h>
 
-#define	NIOAPICS		16	/* Max number of I/O APICs */
-#define	NLAPICS			16	/* Max number of local APICs */
+#define	NIOAPICS		32	/* Max number of I/O APICs */
+#define	NLAPICS			32	/* Max number of local APICs */
 
 typedef	void madt_entry_handler(APIC_HEADER *entry, void *arg);
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index ed448e2e34e..6ddca057a86 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 /* string defined by the Intel MP Spec as identifying the MP table */
 #define	MP_SIG			0x5f504d5f	/* _MP_ */
 
-#define	NAPICID			16	/* Max number of I/O APIC's */
+#define	NAPICID			32	/* Max number of I/O APIC's */
 
 #ifdef PC98
 #define BIOS_BASE		(0xe8000)
diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c
index a1652cfd1f4..436f7ad791d 100644
--- a/sys/i386/acpica/madt.c
+++ b/sys/i386/acpica/madt.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/acpica/madt.h>
 #include <dev/pci/pcivar.h>
 
-#define	NIOAPICS		16	/* Max number of I/O APICs */
-#define	NLAPICS			16	/* Max number of local APICs */
+#define	NIOAPICS		32	/* Max number of I/O APICs */
+#define	NLAPICS			32	/* Max number of local APICs */
 
 typedef	void madt_entry_handler(APIC_HEADER *entry, void *arg);
 
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index ed448e2e34e..6ddca057a86 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 /* string defined by the Intel MP Spec as identifying the MP table */
 #define	MP_SIG			0x5f504d5f	/* _MP_ */
 
-#define	NAPICID			16	/* Max number of I/O APIC's */
+#define	NAPICID			32	/* Max number of I/O APIC's */
 
 #ifdef PC98
 #define BIOS_BASE		(0xe8000)