diff --git a/ChangeLog b/ChangeLog
index 38e6508ab4..468a2ad81e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-06-30  Ulrich Drepper  <drepper@cygnus.com>
+
+	* pwd/getpw.c: Add warning since no buffer size is given and
+	therefore no overrun tests are possible.
+
+1999-06-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* pwd/pwd.h: Add getpw prototype declaration.
+
 1999-06-30  Ulrich Drepper  <drepper@cygnus.com>
 
 	* wcsmbs/wcsrchr.c: Fix handling of L'\0' parameter.
diff --git a/pwd/getpw.c b/pwd/getpw.c
index 8bfb02eb8b..e291769237 100644
--- a/pwd/getpw.c
+++ b/pwd/getpw.c
@@ -58,3 +58,5 @@ __getpw (uid, buf)
   return 0;
 }
 weak_alias (__getpw, getpw)
+
+link_warning (getpw, "the `getpw' function is dangerous and should not be used.")