diff --git a/ChangeLog b/ChangeLog
index fe2d543fd1..7dce45aa52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-06-27 12:58  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/bsd/poll.c: Define __poll, make poll weak alias.
+
 1998-06-27  7:07  Richard Henderson  <rth@cygnus.com>
 
 	* math/atest-exp.c (exp_mpn, main): Cast to mp_limb_t appropriately.
diff --git a/sysdeps/unix/bsd/poll.c b/sysdeps/unix/bsd/poll.c
index 972cd011f1..e92b718022 100644
--- a/sysdeps/unix/bsd/poll.c
+++ b/sysdeps/unix/bsd/poll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997, 1998 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
@@ -29,7 +29,7 @@
    or -1 for errors.  */
 
 int
-poll (fds, nfds, timeout)
+__poll (fds, nfds, timeout)
      struct pollfd *fds;
      unsigned long int nfds;
      int timeout;
@@ -79,3 +79,6 @@ poll (fds, nfds, timeout)
 
   return ready;
 }
+#ifndef __poll
+weak_alias (__poll, poll)
+#endif