diff --git a/headers/private/kernel/kernel.h b/headers/private/kernel/kernel.h
index a5c01e37ea..c77719bb99 100644
--- a/headers/private/kernel/kernel.h
+++ b/headers/private/kernel/kernel.h
@@ -47,7 +47,11 @@
 	// At least, you then know that the stack overflows in this case :)
 
 /** Size of the kernel stack */
-#define KERNEL_STACK_SIZE		(B_PAGE_SIZE * 3)	// 12 kB
+#ifdef B_HAIKU_64_BIT
+	#define KERNEL_STACK_SIZE		(B_PAGE_SIZE * 4)	// 16 kB
+#else
+	#define KERNEL_STACK_SIZE		(B_PAGE_SIZE * 3)	// 12 kB
+#endif
 
 #ifdef DEBUG_KERNEL_STACKS
 #	define KERNEL_STACK_GUARD_PAGES	1