diff --git a/ChangeLog b/ChangeLog
index caa89170d7..0071571bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-25  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #15347]
+	* misc/sys/select.h (__FD_MASK): Avoid signed integer overflow.
+
 2014-02-25  Will Newton  <will.newton@linaro.org>
 
 	* sysdeps/arm/__longjmp.S: Include stap-probe.h.
diff --git a/NEWS b/NEWS
index 3698c404f0..96966d7553 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.20
 
 * The following bugs are resolved with this release:
 
-  15804, 15894, 16447, 16545, 16574, 16600, 16609, 16610, 16611.
+  15347, 15804, 15894, 16447, 16545, 16574, 16600, 16609, 16610, 16611.
 
 * The am33 port, which had not worked for several years, has been removed
   from ports.
diff --git a/misc/sys/select.h b/misc/sys/select.h
index fd13bab41a..941588d9c4 100644
--- a/misc/sys/select.h
+++ b/misc/sys/select.h
@@ -58,7 +58,7 @@ typedef long int __fd_mask;
 /* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
 #define __NFDBITS	(8 * (int) sizeof (__fd_mask))
 #define	__FD_ELT(d)	((d) / __NFDBITS)
-#define	__FD_MASK(d)	((__fd_mask) 1 << ((d) % __NFDBITS))
+#define	__FD_MASK(d)	((__fd_mask) (1UL << ((d) % __NFDBITS)))
 
 /* fd_set for select and pselect.  */
 typedef struct