diff --git a/ChangeLog b/ChangeLog
index 1826f32f23..997a411d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-04  Florian Weimer  <fweimer@redhat.com>
+
+	* debug/test-strcpy_chk.c: Mention __chk_fail ABI test.
+
 2012-11-28  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/fpu/libm-test-ulps: Update.
diff --git a/debug/test-strcpy_chk.c b/debug/test-strcpy_chk.c
index fb9bc78d45..41eb354fa0 100644
--- a/debug/test-strcpy_chk.c
+++ b/debug/test-strcpy_chk.c
@@ -23,6 +23,9 @@
 # define TEST_NAME "strcpy_chk"
 # include "../string/test-string.h"
 
+/* This test case implicitly tests the availability of the __chk_fail
+   symbol, which is part of the public ABI and may be used
+   externally. */
 extern void __attribute__ ((noreturn)) __chk_fail (void);
 char *simple_strcpy_chk (char *, const char *, size_t);
 extern char *normal_strcpy (char *, const char *, size_t)