diff --git a/ChangeLog b/ChangeLog
index 081994cf6f..a165b0a4bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-04-27  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/data/signal.h-data (union sigval): Expect also if
+	[XOPEN2K].
+	(struct sigevent): Likewise.
+	(SIGEV_NONE): Likewise.
+	(SIGEV_SIGNAL): Likewise.
+	(SIGEV_THREAD): Likewise.
+	(SIGRTMIN): Likewise.
+	(SIGRTMAX): Likewise.
+	* conform/Makefile (test-xfail-XOPEN2K/aio.h/conform): Remove
+	variable.
+	(test-xfail-XOPEN2K/mqueue.h/conform): Likewise.
+
 2016-04-27  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #19830]
diff --git a/conform/Makefile b/conform/Makefile
index 56a7dda2a2..26264fc96d 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -209,9 +209,7 @@ test-xfail-UNIX98/sys/wait.h/conform = yes
 test-xfail-UNIX98/ucontext.h/conform = yes
 test-xfail-UNIX98/unistd.h/conform = yes
 test-xfail-UNIX98/utmpx.h/conform = yes
-test-xfail-XOPEN2K/aio.h/conform = yes
 test-xfail-XOPEN2K/fcntl.h/conform = yes
-test-xfail-XOPEN2K/mqueue.h/conform = yes
 test-xfail-XOPEN2K/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes
 test-xfail-XOPEN2K/sys/wait.h/conform = yes
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 7584865f12..6fca921492 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -33,7 +33,7 @@ element {struct timespec} __time_t tv_sec
 element {struct timespec} long tv_nsec
 #endif
 
-#if defined POSIX || defined UNIX98 || defined XOPEN2K8 || defined POSIX2008
+#if defined POSIX || defined UNIX98 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
 element {union sigval} int sival_int
 element {union sigval} {void*} sival_ptr