diff --git a/share/misc/iso3166 b/share/misc/iso3166
index 8b7533b79ab8..299f0111bb69 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -21,7 +21,7 @@
 # two	three	number	name
 AF	AFG	004	Afghanistan
 AL	ALB	008	Albania
-AX	ALA	248	Aland Islands
+AX	ALA	248	Åland Islands
 DZ	DZA	012	Algeria
 AS	ASM	016	American Samoa
 AD	AND	020	Andorra
@@ -59,7 +59,7 @@ BI	BDI	108	Burundi
 KH	KHM	116	Cambodia
 CM	CMR	120	Cameroon
 CA	CAN	124	Canada
-CV	CPV	132	Cape Verde
+CV	CPV	132	Cabo Verde
 KY	CYM	136	Cayman Islands
 CF	CAF	140	Central African Republic
 TD	TCD	148	Chad
@@ -70,20 +70,19 @@ CC	CCK	166	Cocos (Keeling) Islands
 CO	COL	170	Colombia
 KM	COM	174	Comoros
 CG	COG	178	Congo
-CD	COD	180	Congo, the Democratic Republic of the
+CD	COD	180	Congo, Democratic Republic of the
 CK	COK	184	Cook Islands
 CR	CRI	188	Costa Rica
-CI	CIV	384	Cote d'Ivoire
+CI	CIV	384	Côte d'Ivoire
 HR	HRV	191	Croatia
 CU	CUB	192	Cuba
-CW	CUW	531	Curacao
+CW	CUW	531	Curaçao
 CY	CYP	196	Cyprus
 CZ	CZE	203	Czech Republic
 DK	DNK	208	Denmark
 DJ	DJI	262	Djibouti
 DM	DMA	212	Dominica
 DO	DOM	214	Dominican Republic
-TL	TLS	626	Timor-Leste
 EC	ECU	218	Ecuador
 EG	EGY	818	Egypt
 SV	SLV	222	El Salvador
@@ -117,13 +116,14 @@ GW	GNB	624	Guinea-Bissau
 GY	GUY	328	Guyana
 HT	HTI	332	Haiti
 HM	HMD	334	Heard Island and McDonald Islands
+VA	VAT	336	Holy See
 HN	HND	340	Honduras
 HK	HKG	344	Hong Kong
 HU	HUN	348	Hungary
 IS	ISL	352	Iceland
 IN	IND	356	India
 ID	IDN	360	Indonesia
-IR	IRN	364	Iran, Islamic Republic of
+IR	IRN	364	Iran (Islamic Republic of)
 IQ	IRQ	368	Iraq
 IE	IRL	372	Ireland
 IM	IMN	833	Isle of Man
@@ -136,8 +136,8 @@ JO	JOR	400	Jordan
 KZ	KAZ	398	Kazakhstan
 KE	KEN	404	Kenya
 KI	KIR	296	Kiribati
-KP	PRK	408	Korea, Democratic People's Republic of
-KR	KOR	410	Korea, Republic of
+KP	PRK	408	Korea (Democratic People's Republic of)
+KR	KOR	410	Korea (Republic of)
 KW	KWT	414	Kuwait
 KG	KGZ	417	Kyrgyzstan
 LA	LAO	418	Lao People's Democratic Republic
@@ -145,12 +145,12 @@ LV	LVA	428	Latvia
 LB	LBN	422	Lebanon
 LS	LSO	426	Lesotho
 LR	LBR	430	Liberia
-LY	LBY	434	Libyan Arab Jamahiriya
+LY	LBY	434	Libya
 LI	LIE	438	Liechtenstein
 LT	LTU	440	Lithuania
 LU	LUX	442	Luxembourg
 MO	MAC	446	Macao
-MK	MKD	807	Macedonia, the Former Yugoslav Republic of
+MK	MKD	807	Macedonia (the former Yugoslav Republic of)
 MG	MDG	450	Madagascar
 MW	MWI	454	Malawi
 MY	MYS	458	Malaysia
@@ -163,8 +163,8 @@ MR	MRT	478	Mauritania
 MU	MUS	480	Mauritius
 YT	MYT	175	Mayotte
 MX	MEX	484	Mexico
-FM	FSM	583	Micronesia, Federated States of
-MD	MDA	498	Moldova, Republic of
+FM	FSM	583	Micronesia (Federated States of)
+MD	MDA	498	Moldova (Republic of)
 MC	MCO	492	Monaco
 MN	MNG	496	Mongolia
 ME	MNE	499	Montenegro
@@ -188,7 +188,7 @@ NO	NOR	578	Norway
 OM	OMN	512	Oman
 PK	PAK	586	Pakistan
 PW	PLW	585	Palau
-PS	PSE	275	Palestinian Territory, Occupied
+PS	PSE	275	Palestine, State of
 PA	PAN	591	Panama
 PG	PNG	598	Papua New Guinea
 PY	PRY	600	Paraguay
@@ -199,14 +199,16 @@ PL	POL	616	Poland
 PT	PRT	620	Portugal
 PR	PRI	630	Puerto Rico
 QA	QAT	634	Qatar
-RE	REU	638	Reunion
+RE	REU	638	Réunion
 RO	ROU	642	Romania
 RU	RUS	643	Russian Federation
 RW	RWA	646	Rwanda
-BL	BLM	652	Saint Barthelemy
+BL	BLM	652	Saint Barthélemy
+SH	SHN	654	Saint Helena Ascension and Tristan da Cunha
 KN	KNA	659	Saint Kitts and Nevis
 LC	LCA	662	Saint Lucia
-MF	MAF	663	Saint Martin (French Part)
+MF	MAF	663	Saint Martin (French part)
+PM	SPM	666	Saint Pierre and Miquelon
 VC	VCT	670	Saint Vincent and the Grenadines
 WS	WSM	882	Samoa
 SM	SMR	674	San Marino
@@ -227,8 +229,6 @@ GS	SGS	239	South Georgia and the South Sandwich Islands
 SS	SSD	728	South Sudan
 ES	ESP	724	Spain
 LK	LKA	144	Sri Lanka
-SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
-PM	SPM	666	Saint Pierre and Miquelon
 SD	SDN	729	Sudan
 SR	SUR	740	Suriname
 SJ	SJM	744	Svalbard and Jan Mayen
@@ -236,10 +236,11 @@ SZ	SWZ	748	Swaziland
 SE	SWE	752	Sweden
 CH	CHE	756	Switzerland
 SY	SYR	760	Syrian Arab Republic
-TW	TWN	158	Taiwan
+TW	TWN	158	Taiwan, Province of China
 TJ	TJK	762	Tajikistan
-TZ	TZA	834	Tanzania, United Republic of
+TZ	TZA	834	Tanzania United Republic of
 TH	THA	764	Thailand
+TL	TLS	626	Timor-Leste
 TG	TGO	768	Togo
 TK	TKL	772	Tokelau
 TO	TON	776	Tonga
@@ -252,17 +253,16 @@ TV	TUV	798	Tuvalu
 UG	UGA	800	Uganda
 UA	UKR	804	Ukraine
 AE	ARE	784	United Arab Emirates
-GB	GBR	826	United Kingdom
-US	USA	840	United States
+GB	GBR	826	United Kingdom of Great Britain and Northern Ireland
+US	USA	840	United States of America
 UM	UMI	581	United States Minor Outlying Islands
 UY	URY	858	Uruguay
 UZ	UZB	860	Uzbekistan
 VU	VUT	548	Vanuatu
-VA	VAT	336	Holy See (Vatican City State)
 VE	VEN	862	Venezuela, Bolivarian Republic of
 VN	VNM	704	Viet Nam
-VG	VGB	092	Virgin Islands, British
-VI	VIR	850	Virgin Islands, U.S.
+VG	VGB	092	Virgin Islands (British)
+VI	VIR	850	Virgin Islands (U.S.)
 WF	WLF	876	Wallis and Futuna
 EH	ESH	732	Western Sahara
 YE	YEM	887	Yemen