diff --git a/gdb/m88k-nat.c b/gdb/m88k-nat.c
index 41cf84235f..e7c4d68838 100644
--- a/gdb/m88k-nat.c
+++ b/gdb/m88k-nat.c
@@ -255,7 +255,7 @@ fill_gregset (gregsetp, regno)
     register greg_t *regp = (greg_t *) gregsetp;
     extern char registers[];
 
-    for (regi = 0 ; regi < R_R31 ; regi++)
+    for (regi = 0 ; regi <= R_R31 ; regi++)
 	if ((regno == -1) || (regno == regi))
 	    *(regp + regi) = *(int *) &registers[REGISTER_BYTE(regi)];
 
@@ -264,7 +264,7 @@ fill_gregset (gregsetp, regno)
     if ((regno == -1) || (regno == SNIP_REGNUM))
 	*(regp + R_NIP) = *(int *) &registers[REGISTER_BYTE(SNIP_REGNUM)];
     if ((regno == -1) || (regno == SFIP_REGNUM))
-	*(regp + R_PSR) = *(int *) &registers[REGISTER_BYTE(PSR_REGNUM)];
+	*(regp + R_SFIP) = *(int *) &registers[REGISTER_BYTE(SFIP_REGNUM)];
     if ((regno == -1) || (regno == PSR_REGNUM))
 	*(regp + R_PSR) = *(int *) &registers[REGISTER_BYTE(PSR_REGNUM)];
     if ((regno == -1) || (regno == FPSR_REGNUM))