diff --git a/ChangeLog b/ChangeLog
index af730b1fa5..f42d563fb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-11  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* locale/iso-639.def: Convert to UTF-8.
+
 2013-06-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/generic/math-tests.h (EXCEPTION_TESTS_float): New macro.
diff --git a/locale/iso-639.def b/locale/iso-639.def
index c79e9bfeb8..50b5a52f57 100644
--- a/locale/iso-639.def
+++ b/locale/iso-639.def
@@ -181,7 +181,7 @@ DEFINE_LANGUAGE_CODE3 ("Greek, Ancient (to 1453)", grc, grc)
 DEFINE_LANGUAGE_CODE ("Greek, Modern (1453-)", el, ell, gre)
 DEFINE_LANGUAGE_CODE ("Guarani", gn, grn, grn)
 DEFINE_LANGUAGE_CODE ("Gujarati", gu, guj, guj)
-DEFINE_LANGUAGE_CODE3 ("Gwich´in", gwi, gwi)
+DEFINE_LANGUAGE_CODE3 ("Gwich´in", gwi, gwi)
 DEFINE_LANGUAGE_CODE3 ("Haida", hai, hai)
 DEFINE_LANGUAGE_CODE ("Haitian; Haitian Creole", ht, hat, hat)
 DEFINE_LANGUAGE_CODE ("Hausa", ha, hau, hau)
@@ -337,7 +337,7 @@ DEFINE_LANGUAGE_CODE3 ("Norse, Old", non, non)
 DEFINE_LANGUAGE_CODE3 ("North American Indian", nai, nai)
 DEFINE_LANGUAGE_CODE ("Northern Sami", se, sme, sme)
 DEFINE_LANGUAGE_CODE3 ("Northern Sotho; Pedi; Sepedi", nso, nso)
-DEFINE_LANGUAGE_CODE ("Norwegian Bokmål", nb, nob, nob)
+DEFINE_LANGUAGE_CODE ("Norwegian Bokmål", nb, nob, nob)
 DEFINE_LANGUAGE_CODE ("Norwegian Nynorsk", nn, nno, nno)
 DEFINE_LANGUAGE_CODE ("Norwegian", no, nor, nor)
 DEFINE_LANGUAGE_CODE3 ("Nubian languages", nub, nub)
@@ -345,7 +345,7 @@ DEFINE_LANGUAGE_CODE3 ("Nyamwezi", nym, nym)
 DEFINE_LANGUAGE_CODE3 ("Nyankole", nyn, nyn)
 DEFINE_LANGUAGE_CODE3 ("Nyoro", nyo, nyo)
 DEFINE_LANGUAGE_CODE3 ("Nzima", nzi, nzi)
-DEFINE_LANGUAGE_CODE ("Occitan (post 1500); Provençal", oc, oci, oci)
+DEFINE_LANGUAGE_CODE ("Occitan (post 1500); Provençal", oc, oci, oci)
 DEFINE_LANGUAGE_CODE ("Ojibwa", oj, oji, oji)
 DEFINE_LANGUAGE_CODE ("Oriya", or, ori, ori)
 DEFINE_LANGUAGE_CODE ("Oromo", om, orm, orm)
@@ -368,7 +368,7 @@ DEFINE_LANGUAGE_CODE3 ("Pohnpeian", pon, pon)
 DEFINE_LANGUAGE_CODE ("Polish", pl, pol, pol)
 DEFINE_LANGUAGE_CODE ("Portuguese", pt, por, por)
 DEFINE_LANGUAGE_CODE3 ("Prakrit languages", pra, pra)
-DEFINE_LANGUAGE_CODE3 ("Provençal, Old (to 1500)", pro, pro)
+DEFINE_LANGUAGE_CODE3 ("Provençal, Old (to 1500)", pro, pro)
 DEFINE_LANGUAGE_CODE ("Pushto", ps, pus, pus)
 DEFINE_LANGUAGE_CODE ("Quechua", qu, que, que)
 DEFINE_LANGUAGE_CODE ("Raeto-Romance", rm, roh, roh)
@@ -476,7 +476,7 @@ DEFINE_LANGUAGE_CODE ("Uzbek", uz, uzb, uzb)
 DEFINE_LANGUAGE_CODE3 ("Vai", vai, vai)
 DEFINE_LANGUAGE_CODE ("Venda", ve, ven, ven)
 DEFINE_LANGUAGE_CODE ("Vietnamese", vi, vie, vie)
-DEFINE_LANGUAGE_CODE ("Volapük", vo, vol, vol)
+DEFINE_LANGUAGE_CODE ("Volapük", vo, vol, vol)
 DEFINE_LANGUAGE_CODE3 ("Votic", vot, vot)
 DEFINE_LANGUAGE_CODE3 ("Wakashan languages", wak, wak)
 DEFINE_LANGUAGE_CODE3 ("Walser", wae, wae)