diff --git a/data/borders/Papua New Guinea.borders b/data/borders/Papua New Guinea.borders
index f42808f5c4..1405ec1e6e 100644
Binary files a/data/borders/Papua New Guinea.borders and b/data/borders/Papua New Guinea.borders differ
diff --git a/data/borders/Solomon Islands.borders b/data/borders/Solomon Islands.borders
new file mode 100644
index 0000000000..bccc38d94d
Binary files /dev/null and b/data/borders/Solomon Islands.borders differ
diff --git a/data/borders/USA_Washington, D.C..borders b/data/borders/USA_Washington, D.C..borders
deleted file mode 100644
index 7798ec47ef..0000000000
Binary files a/data/borders/USA_Washington, D.C..borders and /dev/null differ
diff --git a/data/countries.txt b/data/countries.txt
index d8c1576d19..76e640e4b2 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -1734,13 +1734,6 @@
        "f":"USA_Delaware",
        "s":2272395
       },
-      {
-       "n":"District of Columbia",
-       "c":"us",
-       "p":0,
-       "f":"USA_District of Columbia",
-       "s":3643325
-      },
       {
        "n":"Florida",
        "c":"us",
@@ -2014,6 +2007,13 @@
        "f":"USA_Washington",
        "s":31311674
       },
+      {
+       "n":"Washington, District of Columbia",
+       "c":"us",
+       "p":0,
+       "f":"USA_District of Columbia",
+       "s":3643325
+      },
       {
        "n":"West Virginia",
        "c":"us",
@@ -2168,6 +2168,12 @@
      "p":0,
      "s":131418
     },
+    {
+     "n":"Solomon Islands",
+     "c":"sb",
+     "p":0,
+     "s":123456
+    },
     {
      "n":"Tokelau",
      "c":"tk",