diff --git a/ChangeLog b/ChangeLog
index b82e7783bb..fa96814f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-05-06  Roland McGrath  <roland@hack.frob.com>
 
+	* io/poll.c (__poll): Renamed from poll.
+	Add libc_hidden_def.
+	(poll): Define as weak alias.
+
 	* debug/ptsname_r_chk.c: Moved to ...
 	* login/ptsname_r_chk.c: ... here.
 	* debug/Makefile (routines): Move ptsname_r_chk to ...
diff --git a/io/poll.c b/io/poll.c
index fadad38991..aa4c2d07e3 100644
--- a/io/poll.c
+++ b/io/poll.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1994-2013 Free Software Foundation, Inc.
+/* Poll (or wait) for file descriptor I/O availability.  Stub version.
+   Copyright (C) 1994-2013 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
@@ -25,13 +26,12 @@
    or -1 for errors.  */
 
 int
-poll (fds, nfds, timeout)
-     struct pollfd *fds;
-     nfds_t nfds;
-     int timeout;
+__poll (struct pollfd *fds, nfds_t nfds, int timeout)
 {
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (__poll)
+weak_alias (__poll, poll)
 
 stub_warning (poll)