diff --git a/ChangeLog b/ChangeLog
index 1d0d2fb221..29f3dab401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-06-09  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #21554]
+	* signal/signal.h (sigpause):: Declare if [__USE_XOPEN_EXTENDED],
+	not [__USE_XOPEN].
+
 	[BZ #21560]
 	* posix/sys/wait.h: Condition include of <signal.h> on
 	[__USE_XOPEN_EXTENDED || __USE_XOPEN2K8].  Include <bits/types.h>
diff --git a/signal/signal.h b/signal/signal.h
index b3114736a5..a43f8887e3 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -142,7 +142,7 @@ extern void psiginfo (const siginfo_t *__pinfo, const char *__s);
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 
-#ifdef __USE_XOPEN
+#ifdef __USE_XOPEN_EXTENDED
 # ifdef __GNUC__
 extern int sigpause (int __sig) __asm__ ("__xpg_sigpause");
 # else