diff --git a/ChangeLog b/ChangeLog
index 65adbd1afa..50a336fab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-06-19  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/sys/select.h-data [XOPEN2K8] (pselect): Expect.
+	* conform/Makefile (test-xfail-XOPEN2K8/sys/select.h/conform):
+	Remove variable.
+	(test-xfail-XOPEN2K8/sys/time.h/conform): Likewise.
+	(test-xfail-XOPEN2K8/utmpx.h/conform).
+
 	* conform/conformtest.pl ($xerrors): New variable.
 	(note_error): New function.
 	(compiletest): New argument $xfail.  Use not_error.
diff --git a/conform/Makefile b/conform/Makefile
index 5db58375e7..7d0a3dd92e 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -237,12 +237,9 @@ test-xfail-XOPEN2K8/limits.h/conform = yes
 test-xfail-XOPEN2K8/math.h/conform = yes
 test-xfail-XOPEN2K8/signal.h/conform = yes
 test-xfail-XOPEN2K8/stdio.h/conform = yes
-test-xfail-XOPEN2K8/sys/select.h/conform = yes
-test-xfail-XOPEN2K8/sys/time.h/conform = yes
 test-xfail-XOPEN2K8/sys/wait.h/conform = yes
 test-xfail-XOPEN2K8/termios.h/conform = yes
 test-xfail-XOPEN2K8/tgmath.h/conform = yes
-test-xfail-XOPEN2K8/utmpx.h/conform = yes
 
 conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I..
 $(conformtest-header-tests): $(objpfx)%/conform.out: \
diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data
index 00f037ac5c..d414ec4624 100644
--- a/conform/data/sys/select.h-data
+++ b/conform/data/sys/select.h-data
@@ -24,7 +24,7 @@ macro FD_ZERO
 
 macro FD_SETSIZE
 
-#if defined XOPEN2K || defined POSIX2008
+#if defined XOPEN2K || defined POSIX2008 || defined XOPEN2K8
 function int pselect (int, fd_set*, fd_set*, fd_set*, const struct timespec*, const sigset_t*)
 #endif
 function int select (int, fd_set*, fd_set*, fd_set*, struct timeval*)