diff --git a/ChangeLog b/ChangeLog
index 8b0f269c3f..20358264bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-08  Ulrich Drepper  <drepper@gmail.com>
 
+	* io/bits/poll2.h: Add __BEGIN/__END_DECLS.
+
 	* io/Makefile (headers): Add bits/poll2.h.
 
 2011-01-05  Will Schmidt  <will_schmidt@vnet.ibm.com>
diff --git a/io/bits/poll2.h b/io/bits/poll2.h
index 7a9dd8a30b..182e97baf2 100644
--- a/io/bits/poll2.h
+++ b/io/bits/poll2.h
@@ -22,6 +22,8 @@
 #endif
 
 
+__BEGIN_DECLS
+
 extern int __REDIRECT (__poll_alias, (struct pollfd *__fds, nfds_t __nfds,
 				      int __timeout), poll);
 extern int __poll_chk (struct pollfd *__fds, nfds_t __nfds, int __timeout,
@@ -76,3 +78,5 @@ ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout,
   return __ppoll_alias (__fds, __nfds, __timeout, __ss);
 }
 #endif
+
+__END_DECLS