diff --git a/ChangeLog b/ChangeLog
index 9418e262cc..6049c707c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-25  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* sysdeps/unix/sysv/linux/mips/configure.ac: Set
+	`arch_minimum_kernel' to 4.5.0 if 2008 NaN encoding is used.
+	* sysdeps/unix/sysv/linux/mips/configure: Regenerate.
+
 2016-01-22  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 
 	* nptl/tst-setuid3.c (is_invalid_barrier_ret): New function.
diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
index dee56aa6fe..a5513fad48 100644
--- a/sysdeps/unix/sysv/linux/mips/configure
+++ b/sysdeps/unix/sysv/linux/mips/configure
@@ -472,9 +472,6 @@ libc_cv_gcc_unwind_find_fde=yes
 
 if test -z "$arch_minimum_kernel"; then
   if test x$libc_cv_mips_nan2008 = xyes; then
-    # FIXME: Adjust this setting to the actual first upstream kernel
-    # version to support the 2008 NaN encoding and then remove this
-    # comment.
-    arch_minimum_kernel=10.0.0
+    arch_minimum_kernel=4.5.0
   fi
 fi
diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac
index 45147c5e43..9147aa4582 100644
--- a/sysdeps/unix/sysv/linux/mips/configure.ac
+++ b/sysdeps/unix/sysv/linux/mips/configure.ac
@@ -131,9 +131,6 @@ libc_cv_gcc_unwind_find_fde=yes
 
 if test -z "$arch_minimum_kernel"; then
   if test x$libc_cv_mips_nan2008 = xyes; then
-    # FIXME: Adjust this setting to the actual first upstream kernel
-    # version to support the 2008 NaN encoding and then remove this
-    # comment.
-    arch_minimum_kernel=10.0.0
+    arch_minimum_kernel=4.5.0
   fi
 fi