diff --git a/ChangeLog b/ChangeLog
index 0685aa0f1f..17551f49ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-04-27  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/stdio.h-data (fdopen): Expect also for
+	[XPG3 || XPG4].
+
 	* conform/data/stdio.h-data (flockfile): Also expect for [UNIX98].
 	(fseeko): Likewise.
 	(ftello): Likewise.
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index 2f382253f4..168128eac9 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -60,7 +60,7 @@ function {char*} cuserid (char*)
 function int dprintf (int, const char*, ...)
 #endif
 function int fclose (FILE*)
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4
+#if !defined ISO && !defined ISO99 && !defined ISO11
 function {FILE*} fdopen (int, const char*)
 #endif
 function int feof (FILE*)