diff --git a/ChangeLog b/ChangeLog
index a8bd0d6101..631ecd9aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* locale/langinfo.h: Correct logic in #ifs when defining YESSTR
+	and NOSTR.
+
 	* locale/Makefile (headers): Add bits/locale.h.
 	* locale/langinfo.h: Don't include <locale.h>.  Include <bits/locale.h>
 	and use __LC_ constants instead of LC_.
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 8b58fabedd..c2e312fabf 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -488,11 +488,11 @@ enum
   __NOEXPR,			/* Regex matching ``no'' input.  */
 #define NOEXPR			__NOEXPR
   __YESSTR,			/* Output string for ``yes''.  */
-#if defined __USE_GNU || (defined __USE_XOPEN || !defined __USE_XOPEN2K)
+#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 # define YESSTR			__YESSTR
 #endif
   __NOSTR,			/* Output string for ``no''.  */
-#if defined __USE_GNU || (defined __USE_XOPEN || !defined __USE_XOPEN2K)
+#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 # define NOSTR			__NOSTR
 #endif
   _NL_NUM_LC_MESSAGES,