diff --git a/ChangeLog b/ChangeLog
index e8d5de229..825d973c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-05 Paulo Andrade <pcpa@gnu.org>
+
+	* lib/jit_arm-vfp.c: Correct regression found in armv7l with
+	latest test cases.
+
 2012-12-05 Paulo Andrade <pcpa@gnu.org>
 
 	* check/ldstxi.tst, check/ldstxr.tst: Correct wrong argument
diff --git a/lib/jit_arm-vfp.c b/lib/jit_arm-vfp.c
index 344f01057..77dffb751 100644
--- a/lib/jit_arm-vfp.c
+++ b/lib/jit_arm-vfp.c
@@ -2197,7 +2197,7 @@ _vfp_stxr_f(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2)
     jit_int32_t		reg;
     if (jit_fpr_p(r2)) {
 	reg = jit_get_reg(jit_class_gpr);
-	addr(rn(reg), r1, r2);
+	addr(rn(reg), r0, r1);
 	VSTR_F32(r2, rn(reg), 0);
 	jit_unget_reg(reg);
     }
@@ -2210,7 +2210,7 @@ _vfp_stxr_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_int32_t r2)
 {
     jit_int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
-    addr(rn(reg), r1, r2);
+    addr(rn(reg), r0, r1);
     if (jit_fpr_p(r2))
 	VSTR_F64(r2, rn(reg), 0);
     else {