diff --git a/ChangeLog b/ChangeLog
index dedba08a8d..4cd64040d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-02  Roland McGrath  <roland@redhat.com>
+
+	* argp/argp-help.c (__argp_short_program_name): Move inside [! _LIBC].
+	* argp/argp-namefrob.h
+	[_LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME]
+	(__argp_short_program_name): Don't declare fn, define it as a macro.
+
 2003-08-22  Simon Josefsson  <jas@extundo.com>
 
 	* argp/argp-fmtstream.h [!__attribute__]: Define to nothing.