diff --git a/sys/powerpc/booke/locore.S b/sys/powerpc/booke/locore.S
index 330a61f70551..73b6100ed622 100644
--- a/sys/powerpc/booke/locore.S
+++ b/sys/powerpc/booke/locore.S
@@ -723,11 +723,12 @@ setfault:
 	mfsprg0	%r4
 	lwz	%r4, TD_PCB(%r2)
 	stw	%r3, PCB_ONFAULT(%r4)
-	mfcr	%r10
+	mfcr	%r4
 	stw	%r0, 0(%r3)
 	stw	%r1, 4(%r3)
 	stw	%r2, 8(%r3)
-	stmw	%r13, 12(%r3)		/* store CR, CTR, XER, [r13 .. r31] */
+	stw	%r4, 8(%r3)
+	stmw	%r13, 16(%r3)		/* store CR, CTR, XER, [r13 .. r31] */
 	li	%r3, 0			/* return FALSE */
 	blr