diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/232_en b/java/src/com/google/i18n/phonenumbers/geocoding/data/232_en
new file mode 100644
index 000000000..9cb399636
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/232_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr b/java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr
new file mode 100644
index 000000000..86c316fa0
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/242_fr differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/java/src/com/google/i18n/phonenumbers/geocoding/data/251_en
new file mode 100644
index 000000000..e389d1c36
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/251_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/java/src/com/google/i18n/phonenumbers/geocoding/data/290_en
new file mode 100644
index 000000000..b65865d79
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/290_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
new file mode 100644
index 000000000..445403b1a
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/290_fr differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/src/com/google/i18n/phonenumbers/geocoding/data/config
index 28f4b378b..fb529e18d 100644
Binary files a/java/src/com/google/i18n/phonenumbers/geocoding/data/config and b/java/src/com/google/i18n/phonenumbers/geocoding/data/config differ
diff --git a/resources/geocoding/en/232.txt b/resources/geocoding/en/232.txt
new file mode 100644
index 000000000..ba0c74f0e
--- /dev/null
+++ b/resources/geocoding/en/232.txt
@@ -0,0 +1,20 @@
+# Copyright (C) 2011 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://en.wikipedia.org/wiki/+232 [440895667]
+
+23222|Freetown
+23232|Bo/Kenema
+23252|Makeni/Koidu
diff --git a/resources/geocoding/en/251.txt b/resources/geocoding/en/251.txt
new file mode 100644
index 000000000..b36cfb042
--- /dev/null
+++ b/resources/geocoding/en/251.txt
@@ -0,0 +1,385 @@
+# Copyright (C) 2011 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/oth/T0202000044/en [2005-09-12]
+# http://en.wikipedia.org/wiki/+251 [441952823]
+
+25111111|Arada I, Addis Ababa
+25111112|Arada II, Addis Ababa
+25111114|French Legasion, Addis Ababa
+25111122|Sidist Kilo I, Addis Ababa
+25111123|Sidist Kilo II, Addis Ababa
+25111124|Sidist Kilo III, Addis Ababa
+25111125|Sidist Kilo Rss I, Addis Ababa
+25111127|Addisu Gebeya, Addis Ababa
+25111131|Kuyu, Addis Ababa
+251111320|Alem Ketema, Addis Ababa
+251111330|Deber Tsige, Addis Ababa
+251111340|Muke Turi, Addis Ababa
+25111135|Fitche, Addis Ababa
+25111155|Arada III, Addis Ababa
+25111156|Arada IV, Addis Ababa
+25111157|Arada V, Addis Ababa
+25111158|Arada VI, Addis Ababa
+251111860|Sululta, Addis Ababa
+25111187|Goha Tsion, Addis Ababa
+25111188|Chancho, Addis Ababa
+25111213|Addis Ketema I, Addis Ababa
+25111236|Hagere Hiwot, Addis Ababa
+25111237|Holeta Gent, Addis Ababa
+25111238|Jeldu, Addis Ababa
+251112580|Ginchi, Addis Ababa
+25111259|Shegole, Addis Ababa
+25111270|Asko, Addis Ababa
+25111275|Addis Ketema II, Addis Ababa
+25111276|Addis Ketema III, Addis Ababa
+25111277|Addis Ketema IV, Addis Ababa
+25111278|Addis Ketema VI, Addis Ababa
+25111279|Kolfe, Addis Ababa
+251112820|Guder, Addis Ababa
+25111283|Addis Alem, Addis Ababa
+25111284|Burayu, Addis Ababa
+251112850|Wolenkomi, Addis Ababa
+251112860|Enchini, Addis Ababa
+25111320|Old Airport I, Addis Ababa
+25111321|Mekanisa, Addis Ababa
+25111330|Wolkite, Addis Ababa
+251113310|Endibir, Addis Ababa
+251113320|Gunchire, Addis Ababa
+251113380|Sebeta, Addis Ababa
+251113390|Teji, Addis Ababa
+25111341|Ghion, Addis Ababa
+251113420|Tullu Bollo, Addis Ababa
+25111348|Jimmaber (Ayer Tena), Addis Ababa
+25111349|Keranyo, Addis Ababa
+25111371|Old Airport II, Addis Ababa
+25111372|Old Airport III, Addis Ababa
+25111373|Old Airport IV, Addis Ababa
+25111374|Old Airport V, Addis Ababa
+251113870|Alem Gena, Addis Ababa
+25111416|Keira I, Addis Ababa
+25111419|Hana Mariam, Addis Ababa
+25111432|Dukem, Addis Ababa
+25111433|Debre Zeit, Addis Ababa
+25111434|Akaki, Addis Ababa
+25111439|Kaliti, Addis Ababa
+25111440|Nifas Silk III, Addis Ababa
+25111442|Nifas Silk I, Addis Ababa
+25111443|Nifas Silk II, Addis Ababa
+25111465|Keria II, Addis Ababa
+25111466|Keria III, Addis Ababa
+25111467|Keira IV, Addis Ababa
+25111468|Keria V, Addis Ababa
+25111515|Filwoha II, Addis Ababa
+25111517|Sheraton/DID, Addis Ababa
+25111544|ECA, Addis Ababa
+25111550|Filwoha IV, Addis Ababa
+25111551|Filwoha III, Addis Ababa
+25111552|Filwha VI, Addis Ababa
+25111553|Filwha V, Addis Ababa
+25111554|Filwha VII, Addis Ababa
+25111618|Bole I, Addis Ababa
+25111626|Bole Michael, Addis Ababa
+25111629|Gerji, Addis Ababa
+25111645|Yeka I, Addis Ababa
+25111646|Yeka II, Addis Ababa
+25111647|Yeka Rss III, Addis Ababa
+25111651|East Addis Ababa Zone
+25111652|South Addis Ababa Zone
+25111653|South-West Addis Ababa Zone
+25111654|West Addis Ababa Zone
+25111655|Central & North Addis Ababa Zones
+25111660|Kotebe, Addis Ababa
+25111661|Bole II, Addis Ababa
+25111662|Bole III, Addis Ababa
+25111663|Bole IV, Addis Ababa
+251116640|Bole V, Addis Ababa
+251116650|Civil Aviation, Addis Ababa
+25111669|Bole VI, Addis Ababa
+25111680|Debre Sina, Addis Ababa
+25111681|Debre Birehan, Addis Ababa
+25111685|Mehal Meda, Addis Ababa
+251116860|Sendafa, Addis Ababa
+251116870|Sheno, Addis Ababa
+251116880|Enwari, Addis Ababa
+25122111|Nazreth I, South-East Region
+25122112|Nazreth II, South-East Region
+25122113|Wolenchiti, South-East Region
+25122114|Melkawarer, South-East Region
+25122115|Alem Tena, South-East Region
+25122116|Modjo, South-East Region
+25122118|Meki, South-East Region
+25122119|Nazreth, South-East Region
+25122220|Wonji, South-East Region
+25122221|Shoa, South-East Region
+25122223|Arerti, South-East Region
+25122224|Awash, South-East Region
+25122225|Melkasa, South-East Region
+25122226|Metehara, South-East Region
+25122227|Agarfa, South-East Region
+25122330|Sire, South-East Region
+25122331|Asela, South-East Region
+25122332|Bokoji, South-East Region
+25122333|Dera, South-East Region
+25122334|Huruta, South-East Region
+25122335|Iteya, South-East Region
+25122336|Assasa, South-East Region
+25122337|Kersa, South-East Region
+25122338|Sagure, South-East Region
+25122339|Diksis, South-East Region
+25122441|Abomsa, South-East Region
+25122444|Ticho, South-East Region
+25122446|Gobesa, South-East Region
+25122447|Goro, South-East Region
+25122661|Bale Goba, South-East Region
+25122662|Gessera, South-East Region
+25122663|Adaba, South-East Region
+25122664|Ghinir, South-East Region
+25122665|Robe, South-East Region
+25122666|Dodolla, South-East Region
+25122668|Dolomena, South-East Region
+25133110|Kabe, North-East Region
+25133111|Dessie I, North-East Region
+25133112|Dessie II, North-East Region
+25133113|Kobo Robit, North-East Region
+25133114|Akesta, North-East Region
+25133116|Wore-Ilu, North-East Region
+25133117|Tenta, North-East Region
+25133118|Senbete, North-East Region
+25133220|Mekana Selam, North-East Region
+25133221|Bistima, North-East Region
+25133222|Hayk, North-East Region
+25133223|Mille, North-East Region
+25133224|Wuchale, North-East Region
+25133225|Elidar, North-East Region
+25133226|Jama, North-East Region
+25133330|Sirinka, North-East Region
+25133331|Woldia, North-East Region
+25133333|Mersa, North-East Region
+25133334|Kobo, North-East Region
+25133336|Lalibela, North-East Region
+25133338|Bure, North-East Region
+25133339|Manda, North-East Region
+25133440|Sekota, North-East Region
+25133444|Ansokia, North-East Region
+25133550|Logia, North-East Region
+25133551|Kombolcha, North-East Region
+25133552|Harbu, North-East Region
+25133553|Bati, North-East Region
+25133554|Kemise, North-East Region
+25133555|Assayta, North-East Region
+25133556|Dupti, North-East Region
+25133660|Majate, North-East Region
+25133661|Epheson, North-East Region
+25133664|Shoa Robit, North-East Region
+25133666|Semera, North-East Region
+25133667|Decheotto, North-East Region
+25134440|Mekele I, North Region
+25134441|Mekele II, North Region
+25134442|Quiha, North Region
+25134443|Wukro, North Region
+25134444|Shire Endasselassie, North Region
+25134445|Adigrat, North Region
+25134446|Abi Adi, North Region
+25134447|Senkata, North Region
+25134448|Humera, North Region
+25134550|Shiraro, North Region
+25134551|Korem, North Region
+25134552|Betemariam, North Region
+25134554|A. Selam, North Region
+25134555|Rama, North Region
+25134556|Adi Daero, North Region
+25134559|Mekele, North Region
+25134660|Adi Gudem, North Region
+25134661|Endabaguna, North Region
+25134662|Mai-Tebri, North Region
+25134663|Waja, North Region
+25134771|Adwa, North Region
+25134772|Inticho, North Region
+25134773|Edaga-Hamus, North Region
+25134774|Alemata, North Region
+25134775|Axum, North Region
+25125111|Dire Dawa I, East Region
+25125112|Dire Dawa II, East Region
+25125114|Shinile, East Region
+25125115|Artshek, East Region
+25125116|Melka Jeldu, East Region
+25125332|Bedeno, East Region
+25125333|Deder, East Region
+25125334|Grawa, East Region
+25125335|Chelenko, East Region
+25125336|Kersa, East Region
+25125337|Kobo, East Region
+25125338|Kombolocha, East Region
+25125441|Hirna, East Region
+25125444|Miesso, East Region
+25125446|Erer, East Region
+25125447|Hurso, East Region
+25125551|Asebe Teferi, East Region
+25125554|Assebot, East Region
+25125661|Alemaya, East Region
+25125662|Aweday, East Region
+25125665|Babile, East Region
+25125666|Harar I, East Region
+25125667|Harar II, East Region
+25125669|Kebribeyah, East Region
+25125771|Degahabur, East Region
+25125772|Gursum, East Region
+25125774|Kabri Dehar, East Region
+25125775|Jigiga, East Region
+25125776|Godie, East Region
+25125777|Teferi Ber, East Region
+25125779|Chinagson, East Region
+25125880|Kelafo, East Region
+25146110|Shashamane I, South Region
+25146111|Shashamane II, South Region
+25146112|Kofele, South Region
+25146114|Wondo Kela, South Region
+25146115|Butajira, South Region
+25146116|Arsi Negele, South Region
+25146117|Adame Tulu, South Region
+25146118|Kuyera, South Region
+25146119|Shasemene, South Region
+25146220|Awassa I, South Region
+25146221|Awassa II, South Region
+25146222|Wonda Basha, South Region
+25146224|Aleta Wondo, South Region
+25146225|Yirgalem, South Region
+25146226|Leku, South Region
+25146227|Chuko, South Region
+25146331|Dilla, South Region
+25146332|Yirga-Chefe, South Region
+25146333|Wonago, South Region
+25146334|Shakiso, South Region
+25146335|Kibre-Mengist, South Region
+25146441|Ziway, South Region
+25146443|Hagere Mariam, South Region
+25146444|Moyale, South Region
+25146445|Negele Borena, South Region
+25146446|Yabello, South Region
+25146449|Dolo Odo, South Region
+25146551|Wollayta, South Region
+25146554|Durame, South Region
+25146555|Hossena, South Region
+25146556|Alaba Kulito, South Region
+25146558|Enseno, South Region
+25146559|Boditi, South Region
+25146660|Kebado, South Region
+25146771|Werabe, South Region
+25146774|Gidole, South Region
+25146777|Sawla, South Region
+25146881|Arba Minch, South Region
+25146882|Kibet, South Region
+25146883|Buii, South Region
+25146884|Arbaminch, South Region
+25147111|Jimma I, South-West Region
+25147112|Jimma II, South-West Region
+25147113|Serbo, South-West Region
+25147114|Assendabo, South-West Region
+25147115|Omonada, South-West Region
+25147116|Seka, South-West Region
+25147117|Sekoru, South-West Region
+25147118|Shebe, South-West Region
+25147119|Jimma, South-West Region
+25147221|Agaro, South-West Region
+25147222|Ghembo, South-West Region
+25147223|Dedo, South-West Region
+25147224|Limmu Genet, South-West Region
+25147225|Haro, South-West Region
+25147226|Yebu, South-West Region
+25147228|Atnago, South-West Region
+25147229|Ghembe, South-West Region
+25147331|Bonga, South-West Region
+25147333|Yayo, South-West Region
+25147334|Maji, South-West Region
+25147335|Mizan Teferi, South-West Region
+25147336|Aman, South-West Region
+25147337|Chora, South-West Region
+25147441|Metu, South-West Region
+25147443|Dembi, South-West Region
+25147444|Darimu, South-West Region
+25147445|Bedele, South-West Region
+25147446|Hurumu, South-West Region
+25147551|Gambela, South-West Region
+25147552|Itang, South-West Region
+25147553|Jikawo, South-West Region
+25147554|Gore, South-West Region
+25147556|Tepi, South-West Region
+25147558|Macha, South-West Region
+25147559|Abebo, South-West Region
+25157227|Ghedo, West Region
+25157550|Ejaji, West Region
+25157555|Dembidolo, West Region
+25157661|Nekemte, West Region
+25157664|Fincha, West Region
+25157665|Backo, West Region
+25157666|Shambu, West Region
+25157667|Arjo, West Region
+25157668|Sire, West Region
+25157771|Ghimbi, West Region
+25157774|Nedjo, West Region
+25157775|Assosa, West Region
+25157776|Mendi, West Region
+25157777|Billa, West Region
+25157778|Guliso, West Region
+25158111|Gonder, North-West Region
+25158114|Azezo, North-West Region
+25158119|Gilgel Beles, North-West Region
+25158220|Bahir-Dar I, North-West Region
+25158221|Dangla, North-West Region
+25158223|Durbette/Abcheklite, North-West Region
+25158224|Gimjabetmariam, North-West Region
+25158225|Chagni/Metekel, North-West Region
+25158226|Bahirdar II, North-West Region
+25158227|Enjibara Kosober, North-West Region
+25158229|Tilili, North-West Region
+25158330|Merawi, North-West Region
+25158331|Metema, North-West Region
+25158332|Maksegnit, North-West Region
+25158333|Chilga, North-West Region
+25158334|Chewahit, North-West Region
+25158335|Kola-Deba, North-West Region
+25158336|Delgi, North-West Region
+25158338|Adet, North-West Region
+25158440|Ebinat, North-West Region
+25158441|Debre-Tabour, North-West Region
+25158443|Hamusit, North-West Region
+25158444|Addis Zemen, North-West Region
+25158445|Nefas Mewcha, North-West Region
+25158446|Worota, North-West Region
+25158447|Mekane-Eyesus, North-West Region
+25158448|Teda, North-West Region
+25158550|Pawe, North-West Region
+25158661|Motta, North-West Region
+25158662|Keraniyo, North-West Region
+25158663|Debre-work, North-West Region
+25158664|Gunde-woin, North-West Region
+25158665|Bichena, North-West Region
+25158770|Mankusa, North-West Region
+25158771|Debre-Markos I, North-West Region
+25158772|Lumame, North-West Region
+25158773|Denbecha, North-West Region
+25158774|Bure, North-West Region
+25158775|Finote-Selam, North-West Region
+25158776|Dejen, North-West Region
+25158777|Amanuel, North-West Region
+25158778|Debre Markos II, North-West Region
+25158779|Jiga, North-West Region
+251911|Addis Ababa Region
+251914|North Region
+251915|East Region
+251916|South Region
+251917|West Region
+251918|North-West Region
diff --git a/resources/geocoding/en/290.txt b/resources/geocoding/en/290.txt
new file mode 100644
index 000000000..962a94a0a
--- /dev/null
+++ b/resources/geocoding/en/290.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2011 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/oth/T02020000AF/en [2011-03-17]
+# http://en.wikipedia.org/wiki/Saint_Helena [439804774]
+
+2902|Jamestown
+2903|St. Helena
+2904|St. Helena
+2906|St. Helena
+2907|St. Helena
+2908|Tristan da Cunha
diff --git a/resources/geocoding/fr/242.txt b/resources/geocoding/fr/242.txt
new file mode 100644
index 000000000..f24bb855c
--- /dev/null
+++ b/resources/geocoding/fr/242.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2011 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://en.wikipedia.org/wiki/+242 [414319147]
+
+24221|Cuvette
+24222|Likouala/Sangha
+24223|Pool
+24224|Plateaux
+24225|Bouenza/Lekoumou/Niari
+24228|Brazzaville
+24229|Pointe-Noire
diff --git a/resources/geocoding/fr/290.txt b/resources/geocoding/fr/290.txt
new file mode 100644
index 000000000..566dc300b
--- /dev/null
+++ b/resources/geocoding/fr/290.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2011 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/oth/T02020000AF/en [2011-03-17]
+# http://fr.wikipedia.org/wiki/Sainte-Hélène,_Ascension_et_Tristan_da_Cunha [439804774]
+
+2902|Jamestown
+2903|Sainte-Hélène
+2904|Sainte-Hélène
+2906|Sainte-Hélène
+2907|Sainte-Hélène
+2908|Tristan da Cunha