diff --git a/ChangeLog b/ChangeLog
index a99aec5dbd..2c8343e6c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2001-08-03  Ulrich Drepper  <drepper@redhat.com>
 
-	* locale/iso-639.def: Add Tigrinya.
+	* locale/iso-639.def: Correct Javanese 2 letter code.  Add Tonga.
+	Add Tigrinya.
 
 2001-08-02  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/locale/iso-639.def b/locale/iso-639.def
index 6b99f497ae..7ae5d51898 100644
--- a/locale/iso-639.def
+++ b/locale/iso-639.def
@@ -68,7 +68,7 @@ DEFINE_LANGUAGE_CODE ("Interlingua", ia, ina, ina)
 DEFINE_LANGUAGE_CODE ("Indonesian", id, ind, ind)
 DEFINE_LANGUAGE_CODE ("Inupiaq", ik, ipk, ipk)
 DEFINE_LANGUAGE_CODE ("Italian", it, ita, ita)
-DEFINE_LANGUAGE_CODE ("Javanese", jw, jaw, jav)
+DEFINE_LANGUAGE_CODE ("Javanese", jv, jaw, jav)
 DEFINE_LANGUAGE_CODE ("Japanese", ja, jpn, jpn)
 DEFINE_LANGUAGE_CODE ("Kalaallisut (Greenlandic)", kl, kal, kal)
 DEFINE_LANGUAGE_CODE ("Kannada", kn, kan, kan)
@@ -151,6 +151,7 @@ DEFINE_LANGUAGE_CODE ("Tagalog", tl, tgl, tgl)
 DEFINE_LANGUAGE_CODE ("Thai", th, tha, tha)
 DEFINE_LANGUAGE_CODE ("Tibetan", bo, bod, tib)
 DEFINE_LANGUAGE_CODE ("Tigrinya", ti, tir, tir)
+DEFINE_LANGUAGE_CODE ("Tonga (Tonga Islands)", to, ton, ton)
 DEFINE_LANGUAGE_CODE ("Tswana", tn, tsn, tsn)
 DEFINE_LANGUAGE_CODE ("Tsonga", ts, tso, tso)
 DEFINE_LANGUAGE_CODE ("Turkish", tr, tur, tur)
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index bc1dff622d..811b6536ae 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,34 @@
+2001-08-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/af_ZA: Use generic LC_COLLATE data.
+	* locales/el_GR: Likewise.
+	* locales/hu_HU: Likewise.
+	* locales/ro_RO: Likewise.  Add transliteration.
+	* locales/be_BY: Likewise.  Handle Ukrainian Ghe.
+	* locales/ru_RU: Likewise.
+	* locales/ru_UA: Likewise.
+	* locales/uk_UA: Likewise.
+	* locales/eu_ES: LC_TIME strings fixed.
+	* locales/am_ET: New file.
+	* locales/translit_et: New file.
+	* locales/az_AZ: New file.
+	* locales/br_FR: New file.
+	* locales/bs_BA: New file.
+	* locales/cy_GB: New file.
+	* locales/hy_AM: New file.
+	* locales/ka_GE: New file.
+	* locales/mi_NZ: New file.
+	* locales/oc_FR: New file.
+	* locales/tg_TJ: New file.
+	* locales/ti_ER: New file.
+	* locales/ti_ET: New file.
+	* locales/tl_PH: New file.
+	* locales/tt_RU: New file.
+	* locales/ur_OK: New file.
+	* locales/uz_UZ: New file.
+	* locales/yi_US: New file.
+	Patches by Pablo Saratxaga <pablo@mandrakesoft.com>.
+
 2001-07-31  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/tr_TR: Define missing fields and remove FIXME comments.