diff --git a/ChangeLog b/ChangeLog
index 194c8c4fd2..f9b94fb58c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-02-01  Andreas Schwab  <schwab@linux-m68k.org>
 
+	* conform/Makefile (linknamespace-libs): Define.
+
 	* sysdeps/m68k/m680x0/m68020/atomic-machine.h
 	(__arch_compare_and_exchange_val_64_acq, atomic_exchange_acq)
 	(atomic_exchange_and_add, atomic_add): Add casts to 64 bit asm
diff --git a/conform/Makefile b/conform/Makefile
index 2743071345..b393641e5d 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -226,6 +226,8 @@ linknamespace-libs-UNIX98 = $(linknamespace-libs-xsi)
 linknamespace-libs-XOPEN2K = $(linknamespace-libs-xsi)
 linknamespace-libs-POSIX2008 = $(linknamespace-libs-posix)
 linknamespace-libs-XOPEN2K8 = $(linknamespace-libs-xsi)
+linknamespace-libs = $(foreach std,$(conformtest-standards),\
+				   $(linknamespace-libs-$(std)))
 
 $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \
 					$(linknamespace-libs)