diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index a54ca935044..82e439fd4c6 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -80,7 +80,7 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		16
+#define MAXCPU		32
 #else
 #define MAXCPU		1
 #endif
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 7f4be06d911..265337ad616 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -66,7 +66,7 @@
 #define MID_MACHINE	MID_I386
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		16
+#define MAXCPU		32
 #else
 #define MAXCPU		1
 #endif /* SMP || KLD_MODULE */