diff --git a/ChangeLog b/ChangeLog
index 363a8324e..397646cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 23471: configure.ac: error names not found properly
+	on Linux owing to restrictive test when searching files.
+
 2007-05-23  Peter Stephenson  <pws@csr.com>
 
 	* John Buddery: 23461 plus comment and test: fix race
diff --git a/configure.ac b/configure.ac
index e2d34cade..a3556d103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1325,7 +1325,6 @@ sed 's/\\\\\\\\/\//g' |
 $AWK '{ if ($1 ~ /err/) files[[$1]] = $1 }
   END { for (var in files) print var }'`"
 rm -f nametmp.c
-lnerrs=0
 for ERRNO_TRY_H in $errfile_list /dev/null
 do
   dnl Try to make sure it doesn't get confused by files that don't
@@ -1337,9 +1336,8 @@ do
   nerrs=`test -f $ERRNO_TRY_H && \
   $EGREP '#[ 	]*define[ 	][ 	]*E[0-9A-Z]*[ 	]*(_HURD_ERRNO )?\(?[_A-Z0-9]' $ERRNO_TRY_H | \
   wc -l | sed 's/[ 	]//g'`
-  if test "x$nerrs" != x && test "$nerrs" -ge 1 && test "$nerrs" -gt "$lnerrs"
+  if test "x$nerrs" != x && test "$nerrs" -ge 1
   then
-    lnerrs=$nerrs
     ERRNO_H="$ERRNO_H $ERRNO_TRY_H"
   fi
 done