diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 479cce8c7bc6..65c27d659f01 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -968,7 +968,7 @@ device		ndis
 # KSTACK_PAGES is the number of memory pages to assign to the kernel
 # stack of each thread.
 
-options 	KSTACK_PAGES=3
+options 	KSTACK_PAGES=5
 
 # Enable detailed accounting by the PV entry allocator.
 
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 4d034ad41d6d..b6d6fc398af3 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -113,7 +113,7 @@
 #define IOPAGES	2		/* pages of i/o permission bitmap */
 
 #ifndef KSTACK_PAGES
-#define KSTACK_PAGES 2		/* Includes pcb! */
+#define KSTACK_PAGES 4		/* Includes pcb! */
 #endif
 #define KSTACK_GUARD_PAGES 1	/* pages of kstack guard; 0 disables */
 #if KSTACK_PAGES < 4