diff --git a/ChangeLog b/ChangeLog
index 99fe2c9ac8..4cc920d255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-13  Samuel Thibault  <samuel.thibault@ens-lyon.org
+
+	* sysdeps/posix/waitid.c (OUR_WAITID): Test against WSTOPPED instead of
+	WUNTRACED.
+
 2016-03-11  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
 
 	* malloc/malloc.c (malloc_consolidate): Replace 0 by NULL in
diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c
index 14bf15e735..392a37d95f 100644
--- a/sysdeps/posix/waitid.c
+++ b/sysdeps/posix/waitid.c
@@ -80,7 +80,7 @@ OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options)
 #endif
 #ifdef WEXITED
       || ((options & (WEXITED|WSTOPPED|WCONTINUED))
-	  != (WEXITED | (options & WUNTRACED)))
+	  != (WEXITED | (options & WSTOPPED)))
 #endif
       )
     {