diff --git a/ChangeLog b/ChangeLog
index 95b1fac64c..7eb623ceca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-09-13  Andreas Schwab  <schwab@redhat.com>
 
+	* misc/sys/select.h (__FD_MASK): Renamed from __FDMASK.
+	(__FD_ELT): Renamed from __FDELT.
+	* misc/bits/select2.h (__FD_ELT): Likewise.
+	* bits/select.h (__FD_SET, __FD_CLR, __FD_ISSET): Use __FD_ELT,
+	__FD_MASK instead of __FDELT, __FDMASK.
+	* sysdeps/i386/bits/select.h (__FD_SET, __FD_CLR, __FD_ISSET):
+	Likewise.
+	* sysdeps/x86_64/bits/select.h (__FD_SET, __FD_CLR, __FD_ISSET):
+	Likewise.
+
 	* elf/Makefile (gen-ldd): Fix pattern.
 
 	* elf/rtld.c (dl_main): Only use USE___THREAD when defined.
diff --git a/bits/select.h b/bits/select.h
index 8a4e537b94..2302c18dde 100644
--- a/bits/select.h
+++ b/bits/select.h
@@ -31,7 +31,8 @@
       __FDS_BITS (__arr)[__i] = 0;					      \
   } while (0)
 #define __FD_SET(d, s) \
-  ((void) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d)))
+  ((void) (__FDS_BITS (s)[__FD_ELT(d)] |= __FD_MASK(d)))
 #define __FD_CLR(d, s) \
-  ((void) (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d)))
-#define __FD_ISSET(d, s)   ((__FDS_BITS (s)[__FDELT (d)] & __FDMASK (d)) != 0)
+  ((void) (__FDS_BITS (s)[__FD_ELT(d)] &= ~__FD_MASK(d)))
+#define __FD_ISSET(d, s) \
+  ((__FDS_BITS (s)[__FD_ELT (d)] & __FD_MASK (d)) != 0)
diff --git a/misc/bits/select2.h b/misc/bits/select2.h
index 27f42018f2..37c4827f1c 100644
--- a/misc/bits/select2.h
+++ b/misc/bits/select2.h
@@ -25,8 +25,8 @@
 extern unsigned long int __fdelt_chk (unsigned long int __d);
 extern unsigned long int __fdelt_warn (unsigned long int __d)
   __warnattr ("bit outside of fd_set selected");
-#undef __FDELT
-#define	__FDELT(d) \
+#undef __FD_ELT
+#define	__FD_ELT(d) \
   ({ unsigned long int __d = d;						    \
      (__builtin_constant_p (__d)					    \
       ? (__d >= __FD_SETSIZE						    \
diff --git a/misc/sys/select.h b/misc/sys/select.h
index 295d3bb6c4..97f2b3d65f 100644
--- a/misc/sys/select.h
+++ b/misc/sys/select.h
@@ -54,14 +54,12 @@ typedef __suseconds_t suseconds_t;
 /* The fd_set member is required to be an array of longs.  */
 typedef long int __fd_mask;
 
-/* Some versions of <linux/posix_types.h> define these macros.  */
+/* Some versions of <linux/posix_types.h> define this macros.  */
 #undef	__NFDBITS
-#undef	__FDELT
-#undef	__FDMASK
 /* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
 #define __NFDBITS	(8 * (int) sizeof (__fd_mask))
-#define	__FDELT(d)	((d) / __NFDBITS)
-#define	__FDMASK(d)	((__fd_mask) 1 << ((d) % __NFDBITS))
+#define	__FD_ELT(d)	((d) / __NFDBITS)
+#define	__FD_MASK(d)	((__fd_mask) 1 << ((d) % __NFDBITS))
 
 /* fd_set for select and pselect.  */
 typedef struct
diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h
index ab9aa3d10e..9e4c56aa85 100644
--- a/sysdeps/i386/bits/select.h
+++ b/sysdeps/i386/bits/select.h
@@ -48,8 +48,8 @@
 #endif	/* GNU CC */
 
 #define __FD_SET(d, set) \
-  ((void) (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d)))
+  ((void) (__FDS_BITS (set)[__FD_ELT (d)] |= __FD_MASK (d)))
 #define __FD_CLR(d, set) \
-  ((void) (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d)))
+  ((void) (__FDS_BITS (set)[__FD_ELT (d)] &= ~__FD_MASK (d)))
 #define __FD_ISSET(d, set) \
-  ((__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d)) != 0)
+  ((__FDS_BITS (set)[__FD_ELT (d)] & __FD_MASK (d)) != 0)
diff --git a/sysdeps/x86_64/bits/select.h b/sysdeps/x86_64/bits/select.h
index a300d58d33..2ebdd7ccbb 100644
--- a/sysdeps/x86_64/bits/select.h
+++ b/sysdeps/x86_64/bits/select.h
@@ -57,8 +57,8 @@
 #endif	/* GNU CC */
 
 #define __FD_SET(d, set) \
-  ((void) (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d)))
+  ((void) (__FDS_BITS (set)[__FD_ELT (d)] |= __FD_MASK (d)))
 #define __FD_CLR(d, set) \
-  ((void) (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d)))
+  ((void) (__FDS_BITS (set)[__FD_ELT (d)] &= ~__FD_MASK (d)))
 #define __FD_ISSET(d, set) \
-  ((__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d)) != 0)
+  ((__FDS_BITS (set)[__FD_ELT (d)] & __FD_MASK (d)) != 0)