diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index 657dd9c4060b14e9921cd998675988db1d6ed9b5..aa0e8de6c49836885b36e08a68316a72479661a3 100644
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -24,7 +24,7 @@ static const char c_time[] =
 	"%a %b %e %T %Y\0"
 	"%H:%M:%S";
 
-static const char c_messages[] = "^[yY]\0" "^[nN]";
+static const char c_messages[] = "^[yY]\0" "^[nN]\0" "yes\0" "no";
 static const char c_numeric[] = ".\0" "";
 
 char *__nl_langinfo_l(nl_item item, locale_t loc)
@@ -49,7 +49,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
 		str = "";
 		break;
 	case LC_MESSAGES:
-		if (idx > 1) return NULL;
+		if (idx > 3) return NULL;
 		str = c_messages;
 		break;
 	default: