@@ -1,4 +1,4 @@
-# $NetBSD: country,v 1.14 2004/10/20 14:07:22 tsarna Exp $
+# $NetBSD: country,v 1.15 2009/12/15 03:39:19 christos Exp $
 #
 # ISO 3166-1 Country Codes
 #
@@ -16,10 +16,10 @@
 # blank entry in the column. FIPS 10-4 codes without a corresponding
 # ISO 3166-1 entity are excluded.
 #
-# This list is up-to-date as of 2004-10-20.
+# This list is up-to-date as of 2009-12-14
 #
+Aaland	AX	ALA	248	
 Afghanistan	AF	AFG	004	AF
-Aaland Islands	AX	ALA	248	
 Albania	AL	ALB	008	AL
 Algeria	DZ	DZA	012	AG
 American Samoa	AS	ASM	016	AQ
@@ -67,8 +67,8 @@
 Cocos (Keeling) Islands	CC	CCK	166	CK
 Colombia	CO	COL	170	CO
 Comoros	KM	COM	174	CN
-Congo	CG	COG	178	CF
-Congo, The Democratic Republic of the	CD	COD	180	CG
+Congo (Brazzaville)	CG	COG	178	CF
+Congo (Kinshasa)	CD	COD	180	CG
 Cook Islands	CK	COK	184	CW
 Costa Rica	CR	CRI	188	CS
 Cote d'Ivoire	CI	CIV	384	IV
@@ -87,14 +87,14 @@
 Eritrea	ER	ERI	232	ER
 Estonia	EE	EST	233	EN
 Ethiopia	ET	ETH	231	ET
-Falkland Islands (Malvinas)	FK	FLK	238	FA
+Falkland Islands	FK	FLK	238	FK
 Faroe Islands	FO	FRO	234	FO
 Fiji	FJ	FJI	242	FJ
 Finland	FI	FIN	246	FI
 France	FR	FRA	250	FR
 French Guiana	GF	GUF	254	FG
 French Polynesia	PF	PYF	258	FP
-French Southern Territories	TF	ATF	260	FS
+French Southern Lands	TF	ATF	260	FS
 Gabon	GA	GAB	266	GB
 Gambia	GM	GMB	270	GA
 Georgia	GE	GEO	268	GG
@@ -107,44 +107,46 @@
 Guadeloupe	GP	GLP	312	GP
 Guam	GU	GUM	316	GQ
 Guatemala	GT	GTM	320	GT
+Guernsey	GG	GGY	831	GK
 Guinea	GN	GIN	324	GV
 Guinea-Bissau	GW	GNB	624	PU
 Guyana	GY	GUY	328	GY
 Haiti	HT	HTI	332	HA
-Heard Island and McDonald Islands	HM	HMD	334	HM
-Holy See (Vatican City State)	VA	VAT	336	VT
+Heard and McDonald Islands	HM	HMD	334	HM
 Honduras	HN	HND	340	HO
 Hong Kong	HK	HKG	344	HK
 Hungary	HU	HUN	348	HU
 Iceland	IS	ISL	352	IC
 India	IN	IND	356	IN
 Indonesia	ID	IDN	360	ID
-Iran, Islamic Republic of	IR	IRN	364	IR
+Iran	IR	IRN	364	IR
 Iraq	IQ	IRQ	368	IZ
 Ireland	IE	IRL	372	EI
+Isle of Man	IM	IMN	833	IM
 Israel	IL	ISR	376	IS
 Italy	IT	ITA	380	IT
 Jamaica	JM	JAM	388	JM
 Japan	JP	JPN	392	JA
+Jersey	JE	JEY	832	JE
 Jordan	JO	JOR	400	JO
 Kazakhstan	KZ	KAZ	398	KZ
 Kenya	KE	KEN	404	KE
 Kiribati	KI	KIR	296	KR
-Korea, Democratic People's Republic of	KP	PRK	408	KN
-Korea, Republic of	KR	KOR	410	KS
+Korea, North	KP	PRK	408	KN
+Korea, South	KR	KOR	410	KS
 Kuwait	KW	KWT	414	KU
 Kyrgyzstan	KG	KGZ	417	KG
-Lao People's Democratic Republic	LA	LAO	418	LA
+Laos	LA	LAO	418	LA
 Latvia	LV	LVA	428	LG
 Lebanon	LB	LBN	422	LE
 Lesotho	LS	LSO	426	LT
 Liberia	LR	LBR	430	LI
-Libyan Arab Jamahiriya	LY	LBY	434	LY
+Libya	LY	LBY	434	LY
 Liechtenstein	LI	LIE	438	LS
 Lithuania	LT	LTU	440	LH
 Luxembourg	LU	LUX	442	LU
-Macao	MO	MAC	446	MC
-Macedonia, the Former Yugoslav Republic of	MK	MKD	807	MK
+Macau	MO	MAC	446	MC
+Macedonia	MK	MKD	807	MK
 Madagascar	MG	MDG	450	MA
 Malawi	MW	MWI	454	MI
 Malaysia	MY	MYS	458	MY
@@ -157,10 +159,11 @@
 Mauritius	MU	MUS	480	MP
 Mayotte	YT	MYT	175	MF
 Mexico	MX	MEX	484	MX
-Micronesia, Federated States of	FM	FSM	583	FM
-Moldova, Republic of	MD	MDA	498	MD
+Micronesia	FM	FSM	583	FM
+Moldova	MD	MDA	498	MD
 Monaco	MC	MCO	492	MN
 Mongolia	MN	MNG	496	MG
+Montenegro	ME	MNE	499	MJ
 Montserrat	MS	MSR	500	MH
 Morocco	MA	MAR	504	MO
 Mozambique	MZ	MOZ	508	MZ
@@ -182,7 +185,7 @@
 Oman	OM	OMN	512	MU
 Pakistan	PK	PAK	586	PK
 Palau	PW	PLW	585	PS
-Palestinian Territory, Occupied	PS	PSE	275	
+Palestine	PS	PSE	275	GZ WE
 Panama	PA	PAN	591	PM
 Papua New Guinea	PG	PNG	598	PP
 Paraguay	PY	PRY	600	PA
@@ -194,12 +197,14 @@
 Puerto Rico	PR	PRI	630	RQ
 Qatar	QA	QAT	634	QA
 Reunion	RE	REU	638	RE
-Romania	RO	ROM	642	RO
+Romania	RO	ROU	642	RO
 Russian Federation	RU	RUS	643	RS
 Rwanda	RW	RWA	646	RW
+Saint Barthélemy	BL	BLM	652	TB
 Saint Helena	SH	SHN	654	SH
 Saint Kitts and Nevis	KN	KNA	659	SC
 Saint Lucia	LC	LCA	662	ST
+Saint Martin (French part)	MF	MAF	663	RN
 Saint Pierre and Miquelon	PM	SPM	666	SB
 Saint Vincent and the Grenadines	VC	VCT	670	VC
 Samoa	WS	WSM	882	WS
@@ -207,7 +212,7 @@
 Sao Tome and Principe	ST	STP	678	TP
 Saudi Arabia	SA	SAU	682	SA
 Senegal	SN	SEN	686	SG
-Serbia and Montenegro	CS	SCG	891	YI
+Serbia	RS	SRB	688	RI KV
 Seychelles	SC	SYC	690	SE
 Sierra Leone	SL	SLE	694	SL
 Singapore	SG	SGP	702	SN
@@ -216,19 +221,19 @@
 Solomon Islands	SB	SLB	090	BP
 Somalia	SO	SOM	706	SO
 South Africa	ZA	ZAF	710	SF
-South Georgia and the South Sandwich Islands	GS	SGS	239	SX
+South Georgia and South Sandwich Islands	GS	SGS	239	SX
 Spain	ES	ESP	724	SP
 Sri Lanka	LK	LKA	144	CE
 Sudan	SD	SDN	736	SU
 Suriname	SR	SUR	740	NS
-Svalbard and Jan Mayen	SJ	SJM	744	SV
+Svalbard and Jan Mayen Islands	SJ	SJM	744	SV JN
 Swaziland	SZ	SWZ	748	WZ
 Sweden	SE	SWE	752	SW
 Switzerland	CH	CHE	756	SZ
-Syrian Arab Republic	SY	SYR	760	SY
-Taiwan, Province of China	TW	TWN	158	TW
+Syria	SY	SYR	760	SY
+Taiwan	TW	TWN	158	TW
 Tajikistan	TJ	TJK	762	TI
-Tanzania, United Republic of	TZ	TZA	834	TZ
+Tanzania	TZ	TZA	834	TZ
 Thailand	TH	THA	764	TH
 Timor-Leste	TL	TLS	626	TT
 Togo	TG	TGO	768	TO
@@ -242,18 +247,18 @@
 Tuvalu	TV	TUV	798	TV
 Uganda	UG	UGA	800	UG
 Ukraine	UA	UKR	804	UP
-United Arab Emirates	AE	ARE	784	TC
+United Arab Emirates	AE	ARE	784	AE
 United Kingdom	GB	GBR	826	UK
-United States	US	USA	840	US
-United States Minor Outlying Islands	UM	UMI	581	
+United States of America	US	USA	840	US
 Uruguay	UY	URY	858	UY
 Uzbekistan	UZ	UZB	860	UZ
 Vanuatu	VU	VUT	548	NH
+Vatican City	VA	VAT	336	VT
 Venezuela	VE	VEN	862	VE
-Viet Nam	VN	VNM	704	VM
+Vietnam	VN	VNM	704	VM
 Virgin Islands, British	VG	VGB	092	VI
 Virgin Islands, U.S.	VI	VIR	850	VQ
-Wallis and Futuna	WF	WLF	876	WF
+Wallis and Futuna Islands	WF	WLF	876	WF
 Western Sahara	EH	ESH	732	WI
 Yemen	YE	YEM	887	YM
 Zambia	ZM	ZMB	894	ZA