diff --git a/ChangeLog b/ChangeLog
index 97043e253b..22ea01d2af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-01  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #2415]
+	* elf/ldd.bash.in: Create better error messages for invalid input
+	files.
+
 	[BZ #2477]
 	* sysdeps/unix/sysv/linux/i386/sysdep.h: Create correct LOADARGS_*
 	macros for non-shared position-independent code.
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index 100d2335d2..a22ad15b59 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -144,9 +144,12 @@ for file do
   *) file=./$file
      ;;
   esac
-  if test ! -f "$file"; then
+  if test ! -e "$file"; then
     echo "ldd: ${file}:" $"No such file or directory" >&2
     result=1
+  elif test ! -f "$file"; then
+    echo "ldd: ${file}:" $"not regular file" >&2
+    result=1
   elif test -r "$file"; then
     test -x "$file" || echo 'ldd:' $"\
 warning: you do not have execution permission for" "\`$file'" >&2