diff --git a/ChangeLog b/ChangeLog
index 8b3e3e2b43..aa2e8f3962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* debug/chk_fail.c (__chk_fail): Print program name in final message.
+
 	* sysdeps/unix/sysv/linux/kernel-features.h: Found reference to
 	MSG_NOSIGNAL being in 2.2 kernels.
 
diff --git a/debug/chk_fail.c b/debug/chk_fail.c
index dc1c3d70b6..29df08b9ca 100644
--- a/debug/chk_fail.c
+++ b/debug/chk_fail.c
@@ -1,5 +1,4 @@
-
-/* Copyright (C) 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,10 +20,13 @@
 #include <stdlib.h>
 
 
+extern char **__libc_argv attribute_hidden;
+
 void
 __attribute__ ((noreturn))
 __chk_fail (void)
 {
-  __libc_fatal ("*** buffer overflow detected ***\n");
+  __libc_message (1, "*** buffer overflow detected ***: %s terminated\n",
+		  __libc_argv[0] ?: "<unknown>");
 }
 libc_hidden_def (__chk_fail)