diff --git a/build.xml b/build.xml
index c6dba9e08..a3c344f3f 100644
--- a/build.xml
+++ b/build.xml
@@ -1261,8 +1261,9 @@
         <copy todir="pkg-temp/docs/" >
           <fileset dir="installer/resources/readme/" includes="readme*.html" />
           <fileset dir="installer/resources/proxy/" includes="*.ht" />
-          <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10; im.png added in 0.8.12; cw.png added in 0.9.5 -->
-          <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/im.png icons/flags/a1.png icons/flags/a2.png icons/flags/cw.png" />
+          <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10;
+               im.png added in 0.8.12; cw.png added in 0.9.5; ap,bl,bq,ss,sx added in 0.9.21 -->
+          <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/im.png icons/flags/a1.png icons/flags/a2.png icons/flags/cw.png icons/flags/ap.png icons/flags/bl.png icons/flags/bq.png icons/flags/ss.png icons/flags/sx.png" />
         </copy>
     </target>
 
diff --git a/installer/resources/countries.txt b/installer/resources/countries.txt
index 5707af567..9702197ef 100644
--- a/installer/resources/countries.txt
+++ b/installer/resources/countries.txt
@@ -16,6 +16,7 @@ AL,Albania
 AM,Armenia
 AN,Netherlands Antilles
 AO,Angola
+AP,Asia/Pacific Region
 AQ,Antarctica
 AR,Argentina
 AS,American Samoa
@@ -33,9 +34,11 @@ BG,Bulgaria
 BH,Bahrain
 BI,Burundi
 BJ,Benin
+BL,Saint Barthélemy
 BM,Bermuda
 BN,Brunei Darussalam
 BO,Bolivia
+BQ,Bonaire
 BR,Brazil
 BS,Bahamas
 BT,Bhutan
@@ -45,7 +48,7 @@ BY,Belarus
 BZ,Belize
 CA,Canada
 CC,Cocos (Keeling) Islands
-CD,The Democratic Republic of the Congo
+CD,Congo
 CF,Central African Republic
 CG,Congo
 CH,Switzerland
@@ -80,7 +83,7 @@ EU,European Union
 FI,Finland
 FJ,Fiji
 FK,Falkland Islands (Malvinas)
-FM,Federated States of Micronesia
+FM,Micronesia
 FO,Faroe Islands
 FR,France
 GA,Gabon
@@ -114,7 +117,7 @@ IM,Isle of Man
 IN,India
 IO,British Indian Ocean Territory
 IQ,Iraq
-IR,Islamic Republic of Iran
+IR,Iran
 IS,Iceland
 IT,Italy
 JE,Jersey
@@ -127,7 +130,7 @@ KH,Cambodia
 KI,Kiribati
 KM,Comoros
 KN,Saint Kitts and Nevis
-KP,The Democratic People's Republic of Korea
+KP,North Korea
 KR,Republic of Korea
 KW,Kuwait
 KY,Cayman Islands
@@ -142,19 +145,19 @@ LS,Lesotho
 LT,Lithuania
 LU,Luxembourg
 LV,Latvia
-LY,Libyan Arab Jamahiriya
+LY,Libya
 MA,Morocco
 MC,Monaco
-MD,Republic of Moldova
+MD,Moldova
 ME,Montenegro
 MF,Saint Martin
 MG,Madagascar
 MH,Marshall Islands
-MK,The Former Yugoslav Republic of Macedonia
+MK,Macedonia
 ML,Mali
 MM,Myanmar
 MN,Mongolia
-MO,Macao
+MO,Macau
 MP,Northern Mariana Islands
 MQ,Martinique
 MR,Mauritania
@@ -214,9 +217,11 @@ SM,San Marino
 SN,Senegal
 SO,Somalia
 SR,Suriname
+SS,South Sudan
 ST,Sao Tome and Principe
 SV,El Salvador
-SY,Syrian Arab Republic
+SX,Sint Maarten
+SY,Syria
 SZ,Swaziland
 TC,Turks and Caicos Islands
 TD,Chad
@@ -233,19 +238,19 @@ TR,Turkey
 TT,Trinidad and Tobago
 TV,Tuvalu
 TW,Taiwan
-TZ,United Republic of Tanzania
+TZ,Tanzania
 UA,Ukraine
 UG,Uganda
 UM,United States Minor Outlying Islands
 US,United States
 UY,Uruguay
 UZ,Uzbekistan
-VA,Holy See (Vatican City State)
+VA,Vatican
 VC,Saint Vincent and the Grenadines
 VE,Venezuela
 VG,Virgin Islands
 VI,Virgin Islands
-VN,Viet Nam
+VN,Vietnam
 VU,Vanuatu
 WF,Wallis and Futuna
 WS,Samoa
diff --git a/installer/resources/icons/flags/ap.png b/installer/resources/icons/flags/ap.png
new file mode 100644
index 000000000..adde45fd8
Binary files /dev/null and b/installer/resources/icons/flags/ap.png differ
diff --git a/installer/resources/icons/flags/bl.png b/installer/resources/icons/flags/bl.png
new file mode 100644
index 000000000..8332c4ec2
Binary files /dev/null and b/installer/resources/icons/flags/bl.png differ
diff --git a/installer/resources/icons/flags/bq.png b/installer/resources/icons/flags/bq.png
new file mode 100644
index 000000000..0620838aa
Binary files /dev/null and b/installer/resources/icons/flags/bq.png differ
diff --git a/installer/resources/icons/flags/ss.png b/installer/resources/icons/flags/ss.png
new file mode 100644
index 000000000..f8716eed4
Binary files /dev/null and b/installer/resources/icons/flags/ss.png differ
diff --git a/installer/resources/icons/flags/sx.png b/installer/resources/icons/flags/sx.png
new file mode 100644
index 000000000..a2edf588e
Binary files /dev/null and b/installer/resources/icons/flags/sx.png differ