diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/20_en b/java/src/com/google/i18n/phonenumbers/geocoding/data/20_en
new file mode 100644
index 000000000..76b227e67
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/20_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_en b/java/src/com/google/i18n/phonenumbers/geocoding/data/230_en
new file mode 100644
index 000000000..3cf325908
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/230_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_es b/java/src/com/google/i18n/phonenumbers/geocoding/data/230_es
new file mode 100644
index 000000000..125af28a6
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/230_es differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr b/java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr
new file mode 100644
index 000000000..b9d497c69
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/230_fr differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt b/java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
new file mode 100644
index 000000000..dbd97cd92
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/239_pt differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/256_en b/java/src/com/google/i18n/phonenumbers/geocoding/data/256_en
new file mode 100644
index 000000000..6043317b4
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/256_en differ
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/data/269_fr b/java/src/com/google/i18n/phonenumbers/geocoding/data/269_fr
new file mode 100644
index 000000000..bbc053b06
Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/geocoding/data/269_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 310506763..e91426542 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/20.txt b/resources/geocoding/en/20.txt
new file mode 100644
index 000000000..cdc3400fa
--- /dev/null
+++ b/resources/geocoding/en/20.txt
@@ -0,0 +1,44 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/+20 [439782121]
+
+2013|Banha
+2015|10th of Ramadan
+202|Cairo/Giza/Qalyubia
+203|Alexandria
+2040|Tanta
+2045|Damanhur
+2046|Marsa Matruh
+2047|Kafr El-Sheikh
+2048|Monufia
+2050|Mansoura
+2055|Zagazig
+2057|Damiette
+2062|Suez
+2064|Ismailia
+2065|Red Sea
+2066|Port Said
+2068|El-Arish
+2069|El-Tor
+2082|Beni Suef
+2084|Fayoum
+2086|Minia
+2088|Assiout
+2092|Wadi El-Gedid
+2093|Sohag
+2095|Luxor
+2096|Qunea
+2097|Aswan
diff --git a/resources/geocoding/en/230.txt b/resources/geocoding/en/230.txt
new file mode 100644
index 000000000..5c9e32c4b
--- /dev/null
+++ b/resources/geocoding/en/230.txt
@@ -0,0 +1,25 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/T0202000088/en [2011-06-05]
+# http://en.wikipedia.org/wiki/+230 [444843696]
+# http://www.icta.mu/documents/numbering2.pdf [2010-11-12]
+
+2302|North Region
+2304|Central Region
+2306|South Region
+230814|Agalega
+23083|Rodrigues
+23087|Rodrigues
diff --git a/resources/geocoding/en/256.txt b/resources/geocoding/en/256.txt
new file mode 100644
index 000000000..df559b2f4
--- /dev/null
+++ b/resources/geocoding/en/256.txt
@@ -0,0 +1,30 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/+256 [440826634]
+
+25641|Kampala
+25643|Jinja
+25645|Mbale
+25646|Mityana
+256464|Mubende
+256465|Masindi
+256471|Gulu
+256473|Lira
+256476|Arua
+256481|Masaka
+256483|Fort Portal
+256485|Mbarara
+256486|Kabale/Rukungiri/Kisoro
diff --git a/resources/geocoding/es/230.txt b/resources/geocoding/es/230.txt
new file mode 100644
index 000000000..23c9c0383
--- /dev/null
+++ b/resources/geocoding/es/230.txt
@@ -0,0 +1,23 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/T0202000088/en [2011-06-05]
+
+2302|Región Norte
+2304|Región Central
+2306|Región Sur
+230814|Agalega
+23083|Rodrigues
+23087|Rodrigues
diff --git a/resources/geocoding/fr/230.txt b/resources/geocoding/fr/230.txt
new file mode 100644
index 000000000..06835f361
--- /dev/null
+++ b/resources/geocoding/fr/230.txt
@@ -0,0 +1,23 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/T0202000088/en [2011-06-05]
+
+2302|Région Nord
+2304|Région Centrale
+2306|Région Sud
+230814|Agalega
+23083|Rodrigues
+23087|Rodrigues
diff --git a/resources/geocoding/fr/269.txt b/resources/geocoding/fr/269.txt
new file mode 100644
index 000000000..da0e8fc34
--- /dev/null
+++ b/resources/geocoding/fr/269.txt
@@ -0,0 +1,34 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/T020200002D/en [2008-04-30]
+# http://en.wikipedia.org/wiki/+269 [444350726]
+
+269760|Domoni
+269761|Mutsamudu
+269762|Mohéli
+269763|Moroni
+269767|Mbéni
+269768|Mitsamiouli
+269769|Foumbouni
+269770|Domoni
+269771|Mutsamudu
+269772|Mohéli
+269773|Moroni
+269774|Moroni
+269775|Moroni
+269777|Mbéni
+269778|Mitsamiouli
+269779|Foumbouni
diff --git a/resources/geocoding/pt/239.txt b/resources/geocoding/pt/239.txt
new file mode 100644
index 000000000..3052a2956
--- /dev/null
+++ b/resources/geocoding/pt/239.txt
@@ -0,0 +1,37 @@
+# Copyright (C) 2011 The Libphonenumber Authors
+
+# 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/T02020000B6/en [2009-12-28]
+# http://en.wikipedia.org/wiki/+239 [444852139]
+
+2392220|Santo Amaro
+2392221|Água Grande
+2392222|Água Grande
+2392223|Água Grande
+2392224|Água Grande
+2392225|Água Grande
+2392226|Água Grande
+2392227|Água Grande
+2392228|Água Grande
+2392231|Guadalupe
+2392233|Neves, Santa Catarina
+239224|Água Grande
+2392251|Região Autonoma do Príncipe
+2392261|Angolares, Porto Alegre
+2392265|Santana, Ribeira Afonso
+2392271|Trindade
+2392272|Madalena
+239228|Água Grande
+239229|Água Grande