diff --git a/ChangeLog b/ChangeLog
index 9c9137fc4b..2e98a5d9c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-08-27  Ulrich Drepper  <drepper@cygnus.com>
 
+	* locale/categories.def: Use __YESSTR amd __NOSTR in definition.
+
 	* manual/argp.texi: Fixing language and typos.
 	* manual/conf.texi: Likewise.
 	* manual/contrib.texi: Likewise.
diff --git a/locale/categories.def b/locale/categories.def
index 71cb86d9f3..160331fb0d 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -169,8 +169,8 @@ DEFINE_CATEGORY
 (
  LC_MESSAGES, "LC_MESSAGES",
  (
-  DEFINE_ELEMENT (YESEXPR, "yesexpr", std, string)
-  DEFINE_ELEMENT (NOEXPR,  "noexpr",  std, string)
-  DEFINE_ELEMENT (YESSTR,  "yesstr",  opt, string)
-  DEFINE_ELEMENT (NOSTR,   "nostr",   opt, string)
+  DEFINE_ELEMENT (YESEXPR,  "yesexpr", std, string)
+  DEFINE_ELEMENT (NOEXPR,   "noexpr",  std, string)
+  DEFINE_ELEMENT (__YESSTR, "yesstr",  opt, string)
+  DEFINE_ELEMENT (__NOSTR,  "nostr",   opt, string)
   ), NO_POSTLOAD, NULL, messages_check, NULL)