diff --git a/ChangeLog b/ChangeLog
index fae86bbc47..5b9a4a57c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-16  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/Makefile (test-xfail-UNIX98/semaphore.h/linknamespace):
+	Remove variable.
+	(test-xfail-XOPEN2K/semaphore.h/linknamespace): Likewise.
+	(test-xfail-XOPEN2K8/semaphore.h/linknamespace): Likewise.
+
 2014-12-16  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* resolv/res_send.c (__libc_res_nsend): Disable warning 'array
diff --git a/conform/Makefile b/conform/Makefile
index 848aae751b..19335656b4 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -395,7 +395,6 @@ test-xfail-UNIX98/pwd.h/linknamespace = yes
 test-xfail-UNIX98/regex.h/linknamespace = yes
 test-xfail-UNIX98/sched.h/linknamespace = yes
 test-xfail-UNIX98/search.h/linknamespace = yes
-test-xfail-UNIX98/semaphore.h/linknamespace = yes
 test-xfail-UNIX98/stdio.h/linknamespace = yes
 test-xfail-UNIX98/stdlib.h/linknamespace = yes
 test-xfail-UNIX98/syslog.h/linknamespace = yes
@@ -412,7 +411,6 @@ test-xfail-XOPEN2K/mqueue.h/linknamespace = yes
 test-xfail-XOPEN2K/netdb.h/linknamespace = yes
 test-xfail-XOPEN2K/regex.h/linknamespace = yes
 test-xfail-XOPEN2K/search.h/linknamespace = yes
-test-xfail-XOPEN2K/semaphore.h/linknamespace = yes
 test-xfail-XOPEN2K/signal.h/linknamespace = yes
 test-xfail-XOPEN2K/spawn.h/linknamespace = yes
 test-xfail-XOPEN2K/stdlib.h/linknamespace = yes
@@ -441,7 +439,6 @@ test-xfail-XOPEN2K8/netdb.h/linknamespace = yes
 test-xfail-XOPEN2K8/pwd.h/linknamespace = yes
 test-xfail-XOPEN2K8/regex.h/linknamespace = yes
 test-xfail-XOPEN2K8/search.h/linknamespace = yes
-test-xfail-XOPEN2K8/semaphore.h/linknamespace = yes
 test-xfail-XOPEN2K8/spawn.h/linknamespace = yes
 test-xfail-XOPEN2K8/syslog.h/linknamespace = yes
 test-xfail-XOPEN2K8/unistd.h/linknamespace = yes