diff --git a/headers/os/arch/x86/arch_debugger.h b/headers/os/arch/x86/arch_debugger.h
index 0cc1a84f0f..13e4415176 100644
--- a/headers/os/arch/x86/arch_debugger.h
+++ b/headers/os/arch/x86/arch_debugger.h
@@ -6,27 +6,27 @@
 #define _ARCH_X86_DEBUGGER_H
 
 struct debug_cpu_state {
-	uint32 gs;
-	uint32 fs;
-	uint32 es;
-	uint32 ds;
-	uint32 edi;
-	uint32 esi;
-	uint32 ebp;
-	uint32 esp;
-	uint32 ebx;
-	uint32 edx;
-	uint32 ecx;
-	uint32 eax;
-	uint32 orig_eax;
-	uint32 orig_edx;
-	uint32 vector;
-	uint32 error_code;
-	uint32 eip;
-	uint32 cs;
-	uint32 flags;
-	uint32 user_esp;
-	uint32 user_ss;
-};
+	uint8	extended_regs[512];
+
+	uint32	gs;
+	uint32	fs;
+	uint32	es;
+	uint32	ds;
+	uint32	edi;
+	uint32	esi;
+	uint32	ebp;
+	uint32	esp;
+	uint32	ebx;
+	uint32	edx;
+	uint32	ecx;
+	uint32	eax;
+	uint32	vector;
+	uint32	error_code;
+	uint32	eip;
+	uint32	cs;
+	uint32	eflags;
+	uint32	user_esp;
+	uint32	user_ss;
+} __attribute__((aligned(8)));
 
 #endif	// _ARCH_X86_DEBUGGER_H