diff --git a/data/borders/Brazil.borders b/data/borders/Brazil.borders
deleted file mode 100644
index de19294140..0000000000
Binary files a/data/borders/Brazil.borders and /dev/null differ
diff --git a/data/borders/Brazil_Central-West.borders b/data/borders/Brazil_Central-West.borders
new file mode 100644
index 0000000000..194803a054
Binary files /dev/null and b/data/borders/Brazil_Central-West.borders differ
diff --git a/data/borders/Brazil_North.borders b/data/borders/Brazil_North.borders
new file mode 100644
index 0000000000..d9afe8d129
Binary files /dev/null and b/data/borders/Brazil_North.borders differ
diff --git a/data/borders/Brazil_Northeast.borders b/data/borders/Brazil_Northeast.borders
new file mode 100644
index 0000000000..247bc739a6
Binary files /dev/null and b/data/borders/Brazil_Northeast.borders differ
diff --git a/data/borders/Brazil_South.borders b/data/borders/Brazil_South.borders
new file mode 100644
index 0000000000..998b13c163
Binary files /dev/null and b/data/borders/Brazil_South.borders differ
diff --git a/data/borders/Brazil_Southeast.borders b/data/borders/Brazil_Southeast.borders
new file mode 100644
index 0000000000..9a6c04a986
Binary files /dev/null and b/data/borders/Brazil_Southeast.borders differ
diff --git a/data/borders/Japan.borders b/data/borders/Japan.borders
deleted file mode 100644
index 92a8eed8ff..0000000000
Binary files a/data/borders/Japan.borders and /dev/null differ
diff --git a/data/borders/Japan_Chubu.borders b/data/borders/Japan_Chubu.borders
new file mode 100644
index 0000000000..4d08ada986
Binary files /dev/null and b/data/borders/Japan_Chubu.borders differ
diff --git a/data/borders/Japan_Chugoku.borders b/data/borders/Japan_Chugoku.borders
new file mode 100644
index 0000000000..971864ed6d
Binary files /dev/null and b/data/borders/Japan_Chugoku.borders differ
diff --git a/data/borders/Japan_Hokkaido.borders b/data/borders/Japan_Hokkaido.borders
new file mode 100644
index 0000000000..a415b563c1
Binary files /dev/null and b/data/borders/Japan_Hokkaido.borders differ
diff --git a/data/borders/Japan_Kanto.borders b/data/borders/Japan_Kanto.borders
new file mode 100644
index 0000000000..dc8fa64eac
Binary files /dev/null and b/data/borders/Japan_Kanto.borders differ
diff --git a/data/borders/Japan_Kinki.borders b/data/borders/Japan_Kinki.borders
new file mode 100644
index 0000000000..621cc43bf6
Binary files /dev/null and b/data/borders/Japan_Kinki.borders differ
diff --git a/data/borders/Japan_Kyushu.borders b/data/borders/Japan_Kyushu.borders
new file mode 100644
index 0000000000..b2ce99e714
Binary files /dev/null and b/data/borders/Japan_Kyushu.borders differ
diff --git a/data/borders/Japan_Shikoku.borders b/data/borders/Japan_Shikoku.borders
new file mode 100644
index 0000000000..9e19531b91
Binary files /dev/null and b/data/borders/Japan_Shikoku.borders differ
diff --git a/data/borders/Japan_Tohoku.borders b/data/borders/Japan_Tohoku.borders
new file mode 100644
index 0000000000..bb7e42e224
Binary files /dev/null and b/data/borders/Japan_Tohoku.borders differ
diff --git a/data/countries.txt b/data/countries.txt
index 1375fcd556..3da630d82d 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -304,7 +304,48 @@
     {
      "n":"Japan",
      "c":"jp",
-     "s":504754759
+     "g":[
+      {
+       "n":"Chūbu",
+       "s":13860294,
+       "f":"Japan_Chubu"
+      },
+      {
+       "n":"Chūgoku",
+       "s":158254842,
+       "f":"Japan_Chugoku"
+      },
+      {
+       "n":"Hokkaidō",
+       "s":158254842,
+       "f":"Japan_Hokkaido"
+      },
+      {
+       "n":"Tokyo & Kantō",
+       "s":158254842,
+       "f":"Japan_Kanto"
+      },
+      {
+       "n":"Kinki",
+       "s":158254842,
+       "f":"Japan_Kinki"
+      },
+      {
+       "n":"Kyūshū",
+       "s":158254842,
+       "f":"Japan_Kyushu"
+      },
+      {
+       "n":"Shikoku",
+       "s":158254842,
+       "f":"Japan_Shikoku"
+      },
+      {
+       "n":"Tōhoku",
+       "s":158254842,
+       "f":"Japan_Tohoku"
+      }
+     ]
     },
     {
      "n":"Kazakhstan",
@@ -1945,7 +1986,33 @@
     {
      "n":"Brazil",
      "c":"br",
-     "s":176113416
+     "g":[
+      {
+       "n":"Central-West",
+       "s":13860294,
+       "f":"Brazil_Central-West"
+      },
+      {
+       "n":"North",
+       "s":158254842,
+       "f":"Brazil_North"
+      },
+      {
+       "n":"Northeast",
+       "s":158254842,
+       "f":"Brazil_Northeast"
+      },
+      {
+       "n":"South",
+       "s":158254842,
+       "f":"Brazil_South"
+      },
+      {
+       "n":"Rio & Southeast",
+       "s":158254842,
+       "f":"Brazil_Southeast"
+      }
+     ]
     },
     {
      "n":"Chile",
diff --git a/data/polygons.lst b/data/polygons.lst
index 2b3cf7415c..5be5db9a5f 100644
--- a/data/polygons.lst
+++ b/data/polygons.lst
@@ -26,7 +26,11 @@ Bolivia
 Bosnia and Herzegovina
 Botswana
 Bouvet Island
-Brazil
+Brazil_Northeast
+Brazil_Central-West
+Brazil_North
+Brazil_South
+Brazil_Southeast
 British Indian Ocean Territory
 British Virgin Islands
 Brunei
@@ -104,7 +108,14 @@ Israel
 Italy
 Ivory Coast
 Jamaica
-Japan
+Japan_Chubu
+Japan_Chugoku
+Japan_Hokkaido
+Japan_Kanto
+Japan_Kinki
+Japan_Kyushu
+Japan_Shikoku
+Japan_Tohoku
 Jersey
 Jordan
 Kazakhstan