diff --git a/src/arch/x86/core/stack.S b/src/arch/x86/core/stack.S
index 98f1cd9b9..995c397ca 100644
--- a/src/arch/x86/core/stack.S
+++ b/src/arch/x86/core/stack.S
@@ -2,6 +2,12 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
 	.arch i386
 
+#ifdef __x86_64__
+#define STACK_SIZE 8192
+#else
+#define STACK_SIZE 4096
+#endif
+
 /****************************************************************************
  * Internal stack
  ****************************************************************************
@@ -10,6 +16,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 	.align 8
 	.globl _stack
 _stack:
-	.space 4096
+	.space STACK_SIZE
 	.globl _estack
 _estack: