diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index e81e9fbe3cd3..ab923fb320a1 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -88,7 +88,7 @@
 #define VADDR(pdi, pti) ((vm_offset_t)(((pdi)<<PDRSHIFT)|((pti)<<PAGE_SHIFT)))
 
 #ifndef NKPT
-#define	NKPT			17	/* actual number of kernel page tables */
+#define	NKPT			30	/* actual number of kernel page tables */
 #endif
 #ifndef NKPDE
 #ifdef SMP
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index e81e9fbe3cd3..ab923fb320a1 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -88,7 +88,7 @@
 #define VADDR(pdi, pti) ((vm_offset_t)(((pdi)<<PDRSHIFT)|((pti)<<PAGE_SHIFT)))
 
 #ifndef NKPT
-#define	NKPT			17	/* actual number of kernel page tables */
+#define	NKPT			30	/* actual number of kernel page tables */
 #endif
 #ifndef NKPDE
 #ifdef SMP