diff --git a/ChangeLog b/ChangeLog
index 2be1e21676..ce605c1e38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2016-05-17  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #20094]
+	* stdlib/stdlib.h (grantpt): Declare if [__USE_XOPEN_EXTENDED],
+	not [__USE_XOPEN].
+	(unlockpt): Likewise.
+	(ptsname): Likewise.
+	* conform/Makefile (test-xfail-XPG3/stdlib.h/conform): Remove
+	variable.
+
 	[BZ #20076]
 	* io/sys/stat.h (S_IFSOCK): Define for [__USE_XOPEN_EXTENDED]
 	instead of [__USE_UNIX98].
diff --git a/conform/Makefile b/conform/Makefile
index f668b2e19a..6c7b683ec2 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -168,7 +168,6 @@ test-xfail-XPG3/limits.h/conform = yes
 test-xfail-XPG3/pwd.h/conform = yes
 test-xfail-XPG3/search.h/conform = yes
 test-xfail-XPG3/signal.h/conform = yes
-test-xfail-XPG3/stdlib.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
 test-xfail-XPG4/netdb.h/conform = yes
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index ad9c6c8904..f0dc951acf 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -876,7 +876,7 @@ extern void setkey (const char *__key) __THROW __nonnull ((1));
 extern int posix_openpt (int __oflag) __wur;
 #endif
 
-#ifdef __USE_XOPEN
+#ifdef __USE_XOPEN_EXTENDED
 /* The next four functions all take a master pseudo-tty fd and
    perform an operation on the associated slave:  */