diff --git a/ChangeLog b/ChangeLog
index f97d54ce8c..a80f2f1ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdlib/atexit.c (atexit): Don't mark as hidden when used to
+	generate compatibility version.
+
 2006-10-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* configure.in: Relax -z relro requirement a bit.
diff --git a/stdlib/atexit.c b/stdlib/atexit.c
index 0575dda03b..256c5fcfc0 100644
--- a/stdlib/atexit.c
+++ b/stdlib/atexit.c
@@ -43,7 +43,9 @@ extern void *__dso_handle __attribute__ ((__weak__));
 
 /* Register FUNC to be executed by `exit'.  */
 int
+#ifndef atexit
 attribute_hidden
+#endif
 atexit (void (*func) (void))
 {
   return __cxa_atexit ((void (*) (void *)) func, NULL,