diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2edd634e46..1b6aa74b31 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -9,8 +9,9 @@
 	* sysdeps/s390/tls.h: Likewise.
 	* sysdeps/sh/tls.h: Likewise.
 	* sysdeps/sparc/tls.h: Likewise.
-									        * nptl/sysdeps/x86_64/tls.h: Likewise.
-										2006-10-27  Jakub Jelinek  <jakub@redhat.com>
+	* sysdeps/x86_64/tls.h: Likewise.
+
+2006-10-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/rtld-lowlevel.h (__rtld_mrlock_lock,
 	__rtld_mrlock_change): Update oldval if atomic compare and exchange
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index a8a9cc4702..2701e27298 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -251,33 +251,6 @@ case "$prefix" in
   ;;
 esac
 
-# Under Linux the NPTL add-on should be available.
-case $add_ons in
-  # It is available.  Good.
-  *nptl*)
-    nptl_missing=
-    ;;
-  *)
-    nptl_missing=yes
-    ;;
-esac
-
-if test "$nptl_missing"; then
-  if test $enable_sanity = yes; then
-    echo "\
-*** On GNU/Linux systems it is normal to compile GNU libc with the
-*** \`nptl' add-on.  Without that, the library will be
-*** incompatible with normal GNU/Linux systems.
-*** If you really mean to not use this add-on, run configure again
-*** using the extra parameter \`--disable-sanity-checks'."
-    exit 1
-  else
-    echo "\
-*** WARNING: Are you sure you do not want to use the \`nptl'
-*** add-on?"
-  fi
-fi
-
 if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
   if test $enable_sanity = yes; then
     echo "\