diff --git a/ChangeLog b/ChangeLog
index 4a7164354f..31b25abb0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-12-18  Sergei Trofimovich  <slyfox@gentoo.org>
 
+	[BZ #22624]
+	* sysdeps/mips/setjmp_aux.c (__sigsetjmp_aux): Use
+	inhibit_stack_protector.
+
 	[BZ #22624]
 	* sysdeps/mips/mips64/setjmp_aux.c (__sigsetjmp_aux): Use
 	inhibit_stack_protector.
diff --git a/sysdeps/mips/setjmp_aux.c b/sysdeps/mips/setjmp_aux.c
index 0052e0c4a4..176243bc51 100644
--- a/sysdeps/mips/setjmp_aux.c
+++ b/sysdeps/mips/setjmp_aux.c
@@ -23,7 +23,12 @@
    pointer.  We do things this way because it's difficult to reliably
    access them in C.  */
 
+/* Stack protection is disabled to avoid changing s0 (or any other
+   caller-save register) before storing it to environment.
+   See BZ #22624.  */
+
 int __attribute__ ((nomips16))
+inhibit_stack_protector
 __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
 {
 #ifdef __mips_hard_float