diff --git a/sys/arch/mips/mips/genassym.cf b/sys/arch/mips/mips/genassym.cf
index e86e4876cdc6..e97afe71c7a8 100644
--- a/sys/arch/mips/mips/genassym.cf
+++ b/sys/arch/mips/mips/genassym.cf
@@ -54,10 +54,11 @@ define  P_BACK			offsetof(struct proc, p_back)
 define  P_PRIORITY		offsetof(struct proc, p_priority)
 define  P_ADDR			offsetof(struct proc, p_addr)
 
-define  P_UPTE			offsetof(struct proc, p_md.md_upte)
-define  U_PCB_REGS		offsetof(struct user, u_pcb.pcb_regs)
+define  P_MD_REGS		offsetof(struct proc, p_md.md_regs)
+define  P_MD_UPTE		offsetof(struct proc, p_md.md_upte)
 
-define  U_PCB_FPREGS		offsetof(struct user, u_pcb.pcb_regs[F0])
+define  U_PCB_REGS		offsetof(struct user, u_pcb.pcb_regs)
+define  U_PCB_FPREGS		offsetof(struct user, u_pcb.pcb_fpregs)
 define  U_PCB_CONTEXT		offsetof(struct user, u_pcb.pcb_context)
 define  U_PCB_ONFAULT		offsetof(struct user, u_pcb.pcb_onfault)
 define  U_PCB_SEGTAB		offsetof(struct user, u_pcb.pcb_segtab)