diff --git a/ChangeLog b/ChangeLog
index d7e9cd4923..7da675cebf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-07  Ondřej Bílka  <neleai@seznam.cz>
+
+	[BZ #16876]
+	* nptl/sockperf.c (client): Check socket return value.
+
 2014-05-06  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/unix/sysv/linux/arm/nptl/unwind.h: File moved to ...
@@ -5,9 +10,9 @@
 
 2014-05-06  Aurelien Jarno  <aurelien@aurel32.net>
 
-        [BZ# 16916]
-        * sysdeps/unix/sysv/linux/sparc/bits/eventfd.h (EFD_SEMAPHORE):
-        Define.
+	[BZ# 16916]
+	* sysdeps/unix/sysv/linux/sparc/bits/eventfd.h (EFD_SEMAPHORE):
+	Define.
 
 2014-05-06  Vidya Ranganathan  <vidya@linux.vnet.ibm.com>
 
diff --git a/NEWS b/NEWS
index cc499de68d..6c9328d40c 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.20
   16677, 16680, 16683, 16689, 16695, 16701, 16706, 16707, 16712, 16713,
   16714, 16731, 16739, 16740, 16743, 16754, 16758, 16759, 16760, 16770,
   16786, 16789, 16791, 16799, 16800, 16815, 16823, 16824, 16831, 16838,
-  16854, 16885, 16888, 16890, 16912, 16916.
+  16854, 16876, 16885, 16888, 16890, 16912, 16916.
 
 * The minimum Linux kernel version that this version of the GNU C Library
   can be used with is 2.6.32.
diff --git a/nptl/sockperf.c b/nptl/sockperf.c
index 740fb883f0..2d4b872740 100644
--- a/nptl/sockperf.c
+++ b/nptl/sockperf.c
@@ -71,7 +71,6 @@ client (void *arg)
   struct thread_param *param = arg;
   unsigned int cnt;
   unsigned int nserv = param->nserv;
-  int clisock[nserv];
   struct pollfd servpoll[nserv];
   struct sockaddr_un servaddr;
   socklen_t servlen;
@@ -102,7 +101,7 @@ client (void *arg)
   for (cnt = 0; cnt < nserv; ++cnt)
     {
       servpoll[cnt].fd = socket (AF_UNIX, SOCK_STREAM, 0);
-      if (clisock < 0)
+      if (servpoll[cnt].fd < 0)
 	{
 	  puts ("cannot create socket in client");
 	  return NULL;