diff --git a/lib/libkse/arch/i386/i386/thr_enter_uts.S b/lib/libkse/arch/i386/i386/thr_enter_uts.S
index ad643a4856f..8d38b0f5ee7 100644
--- a/lib/libkse/arch/i386/i386/thr_enter_uts.S
+++ b/lib/libkse/arch/i386/i386/thr_enter_uts.S
@@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
 #define	MC_LEN_OFFSET		80	/* offset to mc_len from mcontext */
 #define	MC_FP_CW_OFFSET		96	/* offset to FP control word */
 #define	MC_OWNEDFP_OFFSET	88	/* offset to mc_ownedfp from mcontext */
-#define	KM_STACK_SP_OFFSET	32	/* offset to km_stack.ss_sp */
-#define	KM_STACK_SIZE_OFFSET	36	/* offset to km_stack.ss_sp */
-#define	KM_FUNC_OFFSET		28	/* offset to km_func */
+#define	KM_STACK_SP_OFFSET	36	/* offset to km_stack.ss_sp */
+#define	KM_STACK_SIZE_OFFSET	40	/* offset to km_stack.ss_sp */
+#define	KM_FUNC_OFFSET		32	/* offset to km_func */
 
 /*
  * int _thread_enter_uts(kse_thr_mailbox *tm, kse_mailbox *km);
diff --git a/lib/libpthread/arch/i386/i386/thr_enter_uts.S b/lib/libpthread/arch/i386/i386/thr_enter_uts.S
index ad643a4856f..8d38b0f5ee7 100644
--- a/lib/libpthread/arch/i386/i386/thr_enter_uts.S
+++ b/lib/libpthread/arch/i386/i386/thr_enter_uts.S
@@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
 #define	MC_LEN_OFFSET		80	/* offset to mc_len from mcontext */
 #define	MC_FP_CW_OFFSET		96	/* offset to FP control word */
 #define	MC_OWNEDFP_OFFSET	88	/* offset to mc_ownedfp from mcontext */
-#define	KM_STACK_SP_OFFSET	32	/* offset to km_stack.ss_sp */
-#define	KM_STACK_SIZE_OFFSET	36	/* offset to km_stack.ss_sp */
-#define	KM_FUNC_OFFSET		28	/* offset to km_func */
+#define	KM_STACK_SP_OFFSET	36	/* offset to km_stack.ss_sp */
+#define	KM_STACK_SIZE_OFFSET	40	/* offset to km_stack.ss_sp */
+#define	KM_FUNC_OFFSET		32	/* offset to km_func */
 
 /*
  * int _thread_enter_uts(kse_thr_mailbox *tm, kse_mailbox *km);
diff --git a/tools/KSE/ksetest/kse_asm.S b/tools/KSE/ksetest/kse_asm.S
index 73fe7336464..a7bd56f4575 100644
--- a/tools/KSE/ksetest/kse_asm.S
+++ b/tools/KSE/ksetest/kse_asm.S
@@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$");
 #define	MC_FP_REGS_OFFSET	96	/* offset to FP regs from mcontext */
 #define	MC_FP_CW_OFFSET		96	/* offset to FP control word */
 #define	MC_OWNEDFP_OFFSET	88	/* offset to mc_ownedfp from mcontext */
-#define	KM_STACK_SP_OFFSET	32	/* offset to km_stack.ss_sp */
-#define	KM_STACK_SIZE_OFFSET	36	/* offset to km_stack.ss_sp */
-#define	KM_FUNC_OFFSET		28	/* offset to km_func */
+#define	KM_STACK_SP_OFFSET	36	/* offset to km_stack.ss_sp */
+#define	KM_STACK_SIZE_OFFSET	40	/* offset to km_stack.ss_sp */
+#define	KM_FUNC_OFFSET		32	/* offset to km_func */
  
 /*
  * int uts_to_thread(struct kse_thr_mailbox *tdp,