diff --git a/ChangeLog b/ChangeLog
index 6a41b0543d..772dbcf479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,7 @@
 
 2018-04-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
-	* conform/data/sys/un.h-data (struct sockaddr_un): Allow sun_len
-	member.
+	* conform/data/sys/un.h-data: Allow sun_ prefix.
 	* sysdeps/mach/include/lock-intern.h: Move to include/.
 	* sysdeps/mach/include/mach.h: Move to include/.
 	* sysdeps/mach/include/mach/mig_support.h: Move to include/mach/.
diff --git a/conform/data/sys/un.h-data b/conform/data/sys/un.h-data
index 4e00742b9e..08bf9bcfd7 100644
--- a/conform/data/sys/un.h-data
+++ b/conform/data/sys/un.h-data
@@ -1,9 +1,10 @@
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG4
 type {struct sockaddr_un}
 
-optional-element {struct sockaddr_un} {unsigned char} sun_len
 element {struct sockaddr_un} sa_family_t sun_family
 element {struct sockaddr_un} char sun_path []
 
 type sa_family_t
+
+allow sun_*
 #endif