diff --git a/kern/trapentry.S b/kern/trapentry.S
index 406033b..3e7a622 100644
--- a/kern/trapentry.S
+++ b/kern/trapentry.S
@@ -81,9 +81,11 @@ TRAPHANDLER(t_default, T_DEFAULT);
 .globl _alltraps
 _alltraps:
 	sub $0x2, %esp
-	push %ds
+	mov %ds, %eax
+	push %ax
 	sub $0x2, %esp
-	push %es
+	mov %es, %eax
+	push %ax
 	pushal
 	mov $(GD_KD), %eax
 	movl %eax, %ds