diff --git a/ChangeLog b/ChangeLog
index 9f4f9aa42d..90ddfe0eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/data/sys/socket.h-data (*_t): Allow.
+
 2017-04-24  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Remove ununsed
diff --git a/conform/data/sys/socket.h-data b/conform/data/sys/socket.h-data
index 442d4d288a..7cdfec530d 100644
--- a/conform/data/sys/socket.h-data
+++ b/conform/data/sys/socket.h-data
@@ -136,4 +136,5 @@ allow MSG_*
 allow PF_*
 allow SCM_*
 allow SHUT_*
+allow *_t
 #endif