diff --git a/ChangeLog b/ChangeLog
index db45350ebd..458cf8e20f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-10-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* locale/langinfo.h (THOUSEP): Define this and don't duplicate
+	definition of THOUSANDS_SEP.
+
 	* locale/C-monetary.c: Set mon_decimal to empty string.
 	Add missing entry _NL_MONETARY_CRNCYSTR.
 	* stdio-common/printf_fp.c: If MON_DECIAL_POINT is not provided use
diff --git a/locale/langinfo.h b/locale/langinfo.h
index d55afa4e63..2e67413e18 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -474,7 +474,7 @@ enum
 # define THOUSANDS_SEP		__THOUSANDS_SEP
 #endif
   THOUSEP = __THOUSANDS_SEP,
-#define THOUSANDS_SEP		__THOUSANDS_SEP
+#define THOUSEP			THOUSEP
   __GROUPING,
 #ifdef __USE_GNU
 # define GROUPING		__GROUPING
@@ -493,7 +493,7 @@ enum
 #endif
   __NOSTR,			/* Output string for ``no''.  */
 #if defined __USE_GNU || (defined __USE_XOPEN || !defined __USE_XOPEN2K)
-# define	NOSTR		__NOSTR
+# define NOSTR			__NOSTR
 #endif
   _NL_NUM_LC_MESSAGES,
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 1553f0f5fc..d694e59365 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,119 @@
+2000-10-26  GOTO Masanori  <gotom@debian.or.jp>
+
+	* locales/POSIX: New support for date_fmt.
+	* locales/af_ZA: Likewise.
+	* locales/ar_AE: Likewise.
+	* locales/ar_BH: Likewise.
+	* locales/ar_DZ: Likewise.
+	* locales/ar_EG: Likewise.
+	* locales/ar_IQ: Likewise.
+	* locales/ar_JO: Likewise.
+	* locales/ar_KW: Likewise.
+	* locales/ar_LB: Likewise.
+	* locales/ar_LY: Likewise.
+	* locales/ar_MA: Likewise.
+	* locales/ar_OM: Likewise.
+	* locales/ar_QA: Likewise.
+	* locales/ar_SA: Likewise.
+	* locales/ar_SD: Likewise.
+	* locales/ar_SY: Likewise.
+	* locales/ar_TN: Likewise.
+	* locales/ar_YE: Likewise.
+	* locales/be_BY: Likewise.
+	* locales/bg_BG: Likewise.
+	* locales/ca_ES: Likewise.
+	* locales/cs_CZ: Likewise.
+	* locales/da_DK: Likewise.
+	* locales/de_AT: Likewise.
+	* locales/de_BE: Likewise.
+	* locales/de_CH: Likewise.
+	* locales/de_DE: Likewise.
+	* locales/de_LU: Likewise.
+	* locales/el_GR: Likewise.
+	* locales/en_AU: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_DK: Likewise.
+	* locales/en_GB: Likewise.
+	* locales/en_IE: Likewise.
+	* locales/en_NZ: Likewise.
+	* locales/en_US: Likewise.
+	* locales/en_ZA: Likewise.
+	* locales/es_AR: Likewise.
+	* locales/es_BO: Likewise.
+	* locales/es_CL: Likewise.
+	* locales/es_CO: Likewise.
+	* locales/es_CR: Likewise.
+	* locales/es_DO: Likewise.
+	* locales/es_EC: Likewise.
+	* locales/es_ES: Likewise.
+	* locales/es_GT: Likewise.
+	* locales/es_HN: Likewise.
+	* locales/es_MX: Likewise.
+	* locales/es_NI: Likewise.
+	* locales/es_PA: Likewise.
+	* locales/es_PE: Likewise.
+	* locales/es_PR: Likewise.
+	* locales/es_PY: Likewise.
+	* locales/es_SV: Likewise.
+	* locales/es_US: Likewise.
+	* locales/es_UY: Likewise.
+	* locales/es_VE: Likewise.
+	* locales/et_EE: Likewise.
+	* locales/eu_ES: Likewise.
+	* locales/fa_IR: Likewise.
+	* locales/fi_FI: Likewise.
+	* locales/fo_FO: Likewise.
+	* locales/fr_BE: Likewise.
+	* locales/fr_CA: Likewise.
+	* locales/fr_CH: Likewise.
+	* locales/fr_FR: Likewise.
+	* locales/fr_LU: Likewise.
+	* locales/ga_IE: Likewise.
+	* locales/gl_ES: Likewise.
+	* locales/gv_GB: Likewise.
+	* locales/he_IL: Likewise.
+	* locales/hi_IN: Likewise.
+	* locales/hr_HR: Likewise.
+	* locales/hu_HU: Likewise.
+	* locales/i18n: Likewise.
+	* locales/id_ID: Likewise.
+	* locales/is_IS: Likewise.
+	* locales/it_CH: Likewise.
+	* locales/it_IT: Likewise.
+	* locales/iw_IL: Likewise.
+	* locales/ja_JP: Likewise.
+	* locales/kl_GL: Likewise.
+	* locales/ko_KR: Likewise.
+	* locales/kw_GB: Likewise.
+	* locales/lt_LT: Likewise.
+	* locales/lv_LV: Likewise.
+	* locales/mk_MK: Likewise.
+	* locales/mr_IN: Likewise.
+	* locales/mt_MT: Likewise.
+	* locales/nl_BE: Likewise.
+	* locales/nl_NL: Likewise.
+	* locales/nn_NO: Likewise.
+	* locales/no_NO: Likewise.
+	* locales/pl_PL: Likewise.
+	* locales/pt_BR: Likewise.
+	* locales/pt_PT: Likewise.
+	* locales/ro_RO: Likewise.
+	* locales/ru_RU: Likewise.
+	* locales/ru_UA: Likewise.
+	* locales/sk_SK: Likewise.
+	* locales/sl_SI: Likewise.
+	* locales/sq_AL: Likewise.
+	* locales/sr_YU: Likewise.
+	* locales/sv_FI: Likewise.
+	* locales/sv_SE: Likewise.
+	* locales/th_TH: Likewise.
+	* locales/tr_TR: Likewise.
+	* locales/uk_UA: Likewise.
+	* locales/vi_VN: Likewise.
+	* locales/zh_CN: Likewise.
+	* locales/zh_HK: Likewise.
+	* locales/zh_TW: Likewise.
+
 2000-10-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/fa_IR: Fix many problems and change to use UTF-8.