diff --git a/ChangeLog b/ChangeLog
index 750243bdab..babd209bf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-11-04  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/mips/Makefile [$(subdir) = elf]
+	(test-xfail-check-execstack): New variable.
+
 	* sysdeps/mips/localplt.data: New file.
 
 2016-11-04  Yury Norov  <ynorov@caviumnetworks.com>
diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile
index c6729c15f9..bca11d39e0 100644
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -99,6 +99,12 @@ sysdep-dl-routines += dl-static
 
 sysdep_routines += dl-vdso
 endif
+
+# Supporting non-executable stacks on MIPS requires changes to both
+# the Linux kernel and glibc.  See
+# <https://sourceware.org/ml/libc-alpha/2016-01/msg00567.html> and
+# <https://sourceware.org/ml/libc-alpha/2016-01/msg00719.html>.
+test-xfail-check-execstack = yes
 endif
 
 ifeq ($(subdir),stdlib)