diff --git includes/iso.inc includes/iso.inc
index dabbefd..755fd4f 100644
--- includes/iso.inc
+++ includes/iso.inc
@@ -10,7 +10,7 @@
  *
  * Get an array of all country code => country name pairs as laid out
  * in ISO 3166-1 alpha-2.
- * Grabbed from location project (http://drupal.org/project/location).
+ * Grabbed from ISO 3166 code lists (http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm).
  * @return
  *   An array of all country code => country name pairs.
  */
@@ -23,252 +23,254 @@ function _country_get_predefined_list() {
   $t = get_t();
 
   $countries = array(
-    'AD' => $t('Andorra'),
-    'AE' => $t('United Arab Emirates'),
-    'AF' => $t('Afghanistan'),
-    'AG' => $t('Antigua and Barbuda'),
-    'AI' => $t('Anguilla'),
-    'AL' => $t('Albania'),
-    'AM' => $t('Armenia'),
-    'AN' => $t('Netherlands Antilles'),
-    'AO' => $t('Angola'),
-    'AQ' => $t('Antarctica'),
-    'AR' => $t('Argentina'),
-    'AS' => $t('American Samoa'),
-    'AT' => $t('Austria'),
-    'AU' => $t('Australia'),
-    'AW' => $t('Aruba'),
-    'AX' => $t('Aland Islands'),
-    'AZ' => $t('Azerbaijan'),
-    'BA' => $t('Bosnia and Herzegovina'),
-    'BB' => $t('Barbados'),
-    'BD' => $t('Bangladesh'),
-    'BE' => $t('Belgium'),
-    'BF' => $t('Burkina Faso'),
-    'BG' => $t('Bulgaria'),
-    'BH' => $t('Bahrain'),
-    'BI' => $t('Burundi'),
-    'BJ' => $t('Benin'),
-    'BL' => $t('Saint Barthélemy'),
-    'BM' => $t('Bermuda'),
-    'BN' => $t('Brunei'),
-    'BO' => $t('Bolivia'),
-    'BR' => $t('Brazil'),
-    'BS' => $t('Bahamas'),
-    'BT' => $t('Bhutan'),
-    'BV' => $t('Bouvet Island'),
-    'BW' => $t('Botswana'),
-    'BY' => $t('Belarus'),
-    'BZ' => $t('Belize'),
-    'CA' => $t('Canada'),
-    'CC' => $t('Cocos (Keeling) Islands'),
-    'CD' => $t('Congo (Kinshasa)'),
-    'CF' => $t('Central African Republic'),
-    'CG' => $t('Congo (Brazzaville)'),
-    'CH' => $t('Switzerland'),
-    'CI' => $t('Ivory Coast'),
-    'CK' => $t('Cook Islands'),
-    'CL' => $t('Chile'),
-    'CM' => $t('Cameroon'),
-    'CN' => $t('China'),
-    'CO' => $t('Colombia'),
-    'CR' => $t('Costa Rica'),
-    'CU' => $t('Cuba'),
-    'CV' => $t('Cape Verde'),
-    'CX' => $t('Christmas Island'),
-    'CY' => $t('Cyprus'),
-    'CZ' => $t('Czech Republic'),
-    'DE' => $t('Germany'),
-    'DJ' => $t('Djibouti'),
-    'DK' => $t('Denmark'),
-    'DM' => $t('Dominica'),
-    'DO' => $t('Dominican Republic'),
-    'DZ' => $t('Algeria'),
-    'EC' => $t('Ecuador'),
-    'EE' => $t('Estonia'),
-    'EG' => $t('Egypt'),
-    'EH' => $t('Western Sahara'),
-    'ER' => $t('Eritrea'),
-    'ES' => $t('Spain'),
-    'ET' => $t('Ethiopia'),
-    'FI' => $t('Finland'),
-    'FJ' => $t('Fiji'),
-    'FK' => $t('Falkland Islands'),
-    'FM' => $t('Micronesia'),
-    'FO' => $t('Faroe Islands'),
-    'FR' => $t('France'),
-    'GA' => $t('Gabon'),
-    'GB' => $t('United Kingdom'),
-    'GD' => $t('Grenada'),
-    'GE' => $t('Georgia'),
-    'GF' => $t('French Guiana'),
-    'GG' => $t('Guernsey'),
-    'GH' => $t('Ghana'),
-    'GI' => $t('Gibraltar'),
-    'GL' => $t('Greenland'),
-    'GM' => $t('Gambia'),
-    'GN' => $t('Guinea'),
-    'GP' => $t('Guadeloupe'),
-    'GQ' => $t('Equatorial Guinea'),
-    'GR' => $t('Greece'),
-    'GS' => $t('South Georgia and the South Sandwich Islands'),
-    'GT' => $t('Guatemala'),
-    'GU' => $t('Guam'),
-    'GW' => $t('Guinea-Bissau'),
-    'GY' => $t('Guyana'),
-    'HK' => $t('Hong Kong S.A.R., China'),
-    'HM' => $t('Heard Island and McDonald Islands'),
-    'HN' => $t('Honduras'),
-    'HR' => $t('Croatia'),
-    'HT' => $t('Haiti'),
-    'HU' => $t('Hungary'),
-    'ID' => $t('Indonesia'),
-    'IE' => $t('Ireland'),
-    'IL' => $t('Israel'),
-    'IM' => $t('Isle of Man'),
-    'IN' => $t('India'),
-    'IO' => $t('British Indian Ocean Territory'),
-    'IQ' => $t('Iraq'),
-    'IR' => $t('Iran'),
-    'IS' => $t('Iceland'),
-    'IT' => $t('Italy'),
-    'JE' => $t('Jersey'),
-    'JM' => $t('Jamaica'),
-    'JO' => $t('Jordan'),
-    'JP' => $t('Japan'),
-    'KE' => $t('Kenya'),
-    'KG' => $t('Kyrgyzstan'),
-    'KH' => $t('Cambodia'),
-    'KI' => $t('Kiribati'),
-    'KM' => $t('Comoros'),
-    'KN' => $t('Saint Kitts and Nevis'),
-    'KP' => $t('North Korea'),
-    'KR' => $t('South Korea'),
-    'KW' => $t('Kuwait'),
-    'KY' => $t('Cayman Islands'),
-    'KZ' => $t('Kazakhstan'),
-    'LA' => $t('Laos'),
-    'LB' => $t('Lebanon'),
-    'LC' => $t('Saint Lucia'),
-    'LI' => $t('Liechtenstein'),
-    'LK' => $t('Sri Lanka'),
-    'LR' => $t('Liberia'),
-    'LS' => $t('Lesotho'),
-    'LT' => $t('Lithuania'),
-    'LU' => $t('Luxembourg'),
-    'LV' => $t('Latvia'),
-    'LY' => $t('Libya'),
-    'MA' => $t('Morocco'),
-    'MC' => $t('Monaco'),
-    'MD' => $t('Moldova'),
-    'ME' => $t('Montenegro'),
-    'MF' => $t('Saint Martin (French part)'),
-    'MG' => $t('Madagascar'),
-    'MH' => $t('Marshall Islands'),
-    'MK' => $t('Macedonia'),
-    'ML' => $t('Mali'),
-    'MM' => $t('Myanmar'),
-    'MN' => $t('Mongolia'),
-    'MO' => $t('Macao S.A.R., China'),
-    'MP' => $t('Northern Mariana Islands'),
-    'MQ' => $t('Martinique'),
-    'MR' => $t('Mauritania'),
-    'MS' => $t('Montserrat'),
-    'MT' => $t('Malta'),
-    'MU' => $t('Mauritius'),
-    'MV' => $t('Maldives'),
-    'MW' => $t('Malawi'),
-    'MX' => $t('Mexico'),
-    'MY' => $t('Malaysia'),
-    'MZ' => $t('Mozambique'),
-    'NA' => $t('Namibia'),
-    'NC' => $t('New Caledonia'),
-    'NE' => $t('Niger'),
-    'NF' => $t('Norfolk Island'),
-    'NG' => $t('Nigeria'),
-    'NI' => $t('Nicaragua'),
-    'NL' => $t('Netherlands'),
-    'NO' => $t('Norway'),
-    'NP' => $t('Nepal'),
-    'NR' => $t('Nauru'),
-    'NU' => $t('Niue'),
-    'NZ' => $t('New Zealand'),
-    'OM' => $t('Oman'),
-    'PA' => $t('Panama'),
-    'PE' => $t('Peru'),
-    'PF' => $t('French Polynesia'),
-    'PG' => $t('Papua New Guinea'),
-    'PH' => $t('Philippines'),
-    'PK' => $t('Pakistan'),
-    'PL' => $t('Poland'),
-    'PM' => $t('Saint Pierre and Miquelon'),
-    'PN' => $t('Pitcairn'),
-    'PR' => $t('Puerto Rico'),
-    'PS' => $t('Palestinian Territory'),
-    'PT' => $t('Portugal'),
-    'PW' => $t('Palau'),
-    'PY' => $t('Paraguay'),
-    'QA' => $t('Qatar'),
-    'RE' => $t('Reunion'),
-    'RO' => $t('Romania'),
-    'RS' => $t('Serbia'),
-    'RU' => $t('Russia'),
-    'RW' => $t('Rwanda'),
-    'SA' => $t('Saudi Arabia'),
-    'SB' => $t('Solomon Islands'),
-    'SC' => $t('Seychelles'),
-    'SD' => $t('Sudan'),
-    'SE' => $t('Sweden'),
-    'SG' => $t('Singapore'),
-    'SH' => $t('Saint Helena'),
-    'SI' => $t('Slovenia'),
-    'SJ' => $t('Svalbard and Jan Mayen'),
-    'SK' => $t('Slovakia'),
-    'SL' => $t('Sierra Leone'),
-    'SM' => $t('San Marino'),
-    'SN' => $t('Senegal'),
-    'SO' => $t('Somalia'),
-    'SR' => $t('Suriname'),
-    'ST' => $t('Sao Tome and Principe'),
-    'SV' => $t('El Salvador'),
-    'SY' => $t('Syria'),
-    'SZ' => $t('Swaziland'),
-    'TC' => $t('Turks and Caicos Islands'),
-    'TD' => $t('Chad'),
-    'TF' => $t('French Southern Territories'),
-    'TG' => $t('Togo'),
-    'TH' => $t('Thailand'),
-    'TJ' => $t('Tajikistan'),
-    'TK' => $t('Tokelau'),
-    'TL' => $t('Timor-Leste'),
-    'TM' => $t('Turkmenistan'),
-    'TN' => $t('Tunisia'),
-    'TO' => $t('Tonga'),
-    'TR' => $t('Turkey'),
-    'TT' => $t('Trinidad and Tobago'),
-    'TV' => $t('Tuvalu'),
-    'TW' => $t('Taiwan'),
-    'TZ' => $t('Tanzania'),
-    'UA' => $t('Ukraine'),
-    'UG' => $t('Uganda'),
-    'UM' => $t('United States Minor Outlying Islands'),
-    'US' => $t('United States'),
-    'UY' => $t('Uruguay'),
-    'UZ' => $t('Uzbekistan'),
-    'VA' => $t('Vatican'),
-    'VC' => $t('Saint Vincent and the Grenadines'),
-    'VE' => $t('Venezuela'),
-    'VG' => $t('British Virgin Islands'),
-    'VI' => $t('U.S. Virgin Islands'),
-    'VN' => $t('Vietnam'),
-    'VU' => $t('Vanuatu'),
-    'WF' => $t('Wallis and Futuna'),
-    'WS' => $t('Samoa'),
-    'YE' => $t('Yemen'),
-    'YT' => $t('Mayotte'),
-    'ZA' => $t('South Africa'),
-    'ZM' => $t('Zambia'),
-    'ZW' => $t('Zimbabwe'),
+    'AD' => $t('Andorra'),
+    'AE' => $t('United Arab Emirates'),
+    'AF' => $t('Afghanistan'),
+    'AG' => $t('Antigua and Barbuda'),
+    'AI' => $t('Anguilla'),
+    'AL' => $t('Albania'),
+    'AM' => $t('Armenia'),
+    'AO' => $t('Angola'),
+    'AQ' => $t('Antarctica'),
+    'AR' => $t('Argentina'),
+    'AS' => $t('American Samoa'),
+    'AT' => $t('Austria'),
+    'AU' => $t('Australia'),
+    'AW' => $t('Aruba'),
+    'AX' => $t('ÅLand Islands'),
+    'AZ' => $t('Azerbaijan'),
+    'BA' => $t('Bosnia and Herzegovina'),
+    'BB' => $t('Barbados'),
+    'BD' => $t('Bangladesh'),
+    'BE' => $t('Belgium'),
+    'BF' => $t('Burkina Faso'),
+    'BG' => $t('Bulgaria'),
+    'BH' => $t('Bahrain'),
+    'BI' => $t('Burundi'),
+    'BJ' => $t('Benin'),
+    'BL' => $t('Saint BarthÉLemy'),
+    'BM' => $t('Bermuda'),
+    'BN' => $t('Brunei Darussalam'),
+    'BO' => $t('Bolivia, Plurinational State Of'),
+    'BQ' => $t('Bonaire, Saint Eustatius and Saba'),
+    'BR' => $t('Brazil'),
+    'BS' => $t('Bahamas'),
+    'BT' => $t('Bhutan'),
+    'BV' => $t('Bouvet Island'),
+    'BW' => $t('Botswana'),
+    'BY' => $t('Belarus'),
+    'BZ' => $t('Belize'),
+    'CA' => $t('Canada'),
+    'CC' => $t('Cocos (Keeling) Islands'),
+    'CD' => $t('Congo, The Democratic Republic Of The'),
+    'CF' => $t('Central African Republic'),
+    'CG' => $t('Congo'),
+    'CH' => $t('Switzerland'),
+    'CI' => $t('CÔTe D\'Ivoire'),
+    'CK' => $t('Cook Islands'),
+    'CL' => $t('Chile'),
+    'CM' => $t('Cameroon'),
+    'CN' => $t('China'),
+    'CO' => $t('Colombia'),
+    'CR' => $t('Costa Rica'),
+    'CU' => $t('Cuba'),
+    'CV' => $t('Cape Verde'),
+    'CW' => $t('CuraÇAo'),
+    'CX' => $t('Christmas Island'),
+    'CY' => $t('Cyprus'),
+    'CZ' => $t('Czech Republic'),
+    'DE' => $t('Germany'),
+    'DJ' => $t('Djibouti'),
+    'DK' => $t('Denmark'),
+    'DM' => $t('Dominica'),
+    'DO' => $t('Dominican Republic'),
+    'DZ' => $t('Algeria'),
+    'EC' => $t('Ecuador'),
+    'EE' => $t('Estonia'),
+    'EG' => $t('Egypt'),
+    'EH' => $t('Western Sahara'),
+    'ER' => $t('Eritrea'),
+    'ES' => $t('Spain'),
+    'ET' => $t('Ethiopia'),
+    'FI' => $t('Finland'),
+    'FJ' => $t('Fiji'),
+    'FK' => $t('Falkland Islands (Malvinas)'),
+    'FM' => $t('Micronesia, Federated States Of'),
+    'FO' => $t('Faroe Islands'),
+    'FR' => $t('France'),
+    'GA' => $t('Gabon'),
+    'GB' => $t('United Kingdom'),
+    'GD' => $t('Grenada'),
+    'GE' => $t('Georgia'),
+    'GF' => $t('French Guiana'),
+    'GG' => $t('Guernsey'),
+    'GH' => $t('Ghana'),
+    'GI' => $t('Gibraltar'),
+    'GL' => $t('Greenland'),
+    'GM' => $t('Gambia'),
+    'GN' => $t('Guinea'),
+    'GP' => $t('Guadeloupe'),
+    'GQ' => $t('Equatorial Guinea'),
+    'GR' => $t('Greece'),
+    'GS' => $t('South Georgia and The South Sandwich Islands'),
+    'GT' => $t('Guatemala'),
+    'GU' => $t('Guam'),
+    'GW' => $t('Guinea-Bissau'),
+    'GY' => $t('Guyana'),
+    'HK' => $t('Hong Kong'),
+    'HM' => $t('Heard Island and Mcdonald Islands'),
+    'HN' => $t('Honduras'),
+    'HR' => $t('Croatia'),
+    'HT' => $t('Haiti'),
+    'HU' => $t('Hungary'),
+    'ID' => $t('Indonesia'),
+    'IE' => $t('Ireland'),
+    'IL' => $t('Israel'),
+    'IM' => $t('Isle Of Man'),
+    'IN' => $t('India'),
+    'IO' => $t('British Indian Ocean Territory'),
+    'IQ' => $t('Iraq'),
+    'IR' => $t('Iran, Islamic Republic Of'),
+    'IS' => $t('Iceland'),
+    'IT' => $t('Italy'),
+    'JE' => $t('Jersey'),
+    'JM' => $t('Jamaica'),
+    'JO' => $t('Jordan'),
+    'JP' => $t('Japan'),
+    'KE' => $t('Kenya'),
+    'KG' => $t('Kyrgyzstan'),
+    'KH' => $t('Cambodia'),
+    'KI' => $t('Kiribati'),
+    'KM' => $t('Comoros'),
+    'KN' => $t('Saint Kitts and Nevis'),
+    'KP' => $t('Korea, Democratic People\'S Republic Of'),
+    'KR' => $t('Korea, Republic Of'),
+    'KW' => $t('Kuwait'),
+    'KY' => $t('Cayman Islands'),
+    'KZ' => $t('Kazakhstan'),
+    'LA' => $t('Lao People\'S Democratic Republic'),
+    'LB' => $t('Lebanon'),
+    'LC' => $t('Saint Lucia'),
+    'LI' => $t('Liechtenstein'),
+    'LK' => $t('Sri Lanka'),
+    'LR' => $t('Liberia'),
+    'LS' => $t('Lesotho'),
+    'LT' => $t('Lithuania'),
+    'LU' => $t('Luxembourg'),
+    'LV' => $t('Latvia'),
+    'LY' => $t('Libyan Arab Jamahiriya'),
+    'MA' => $t('Morocco'),
+    'MC' => $t('Monaco'),
+    'MD' => $t('Moldova, Republic Of'),
+    'ME' => $t('Montenegro'),
+    'MF' => $t('Saint Martin (French Part)'),
+    'MG' => $t('Madagascar'),
+    'MH' => $t('Marshall Islands'),
+    'MK' => $t('Macedonia, The Former Yugoslav Republic Of'),
+    'ML' => $t('Mali'),
+    'MM' => $t('Myanmar'),
+    'MN' => $t('Mongolia'),
+    'MO' => $t('Macao'),
+    'MP' => $t('Northern Mariana Islands'),
+    'MQ' => $t('Martinique'),
+    'MR' => $t('Mauritania'),
+    'MS' => $t('Montserrat'),
+    'MT' => $t('Malta'),
+    'MU' => $t('Mauritius'),
+    'MV' => $t('Maldives'),
+    'MW' => $t('Malawi'),
+    'MX' => $t('Mexico'),
+    'MY' => $t('Malaysia'),
+    'MZ' => $t('Mozambique'),
+    'NA' => $t('Namibia'),
+    'NC' => $t('New Caledonia'),
+    'NE' => $t('Niger'),
+    'NF' => $t('Norfolk Island'),
+    'NG' => $t('Nigeria'),
+    'NI' => $t('Nicaragua'),
+    'NL' => $t('Netherlands'),
+    'NO' => $t('Norway'),
+    'NP' => $t('Nepal'),
+    'NR' => $t('Nauru'),
+    'NU' => $t('Niue'),
+    'NZ' => $t('New Zealand'),
+    'OM' => $t('Oman'),
+    'PA' => $t('Panama'),
+    'PE' => $t('Peru'),
+    'PF' => $t('French Polynesia'),
+    'PG' => $t('Papua New Guinea'),
+    'PH' => $t('Philippines'),
+    'PK' => $t('Pakistan'),
+    'PL' => $t('Poland'),
+    'PM' => $t('Saint Pierre and Miquelon'),
+    'PN' => $t('Pitcairn'),
+    'PR' => $t('Puerto Rico'),
+    'PS' => $t('Palestinian Territory, Occupied'),
+    'PT' => $t('Portugal'),
+    'PW' => $t('Palau'),
+    'PY' => $t('Paraguay'),
+    'QA' => $t('Qatar'),
+    'RE' => $t('RÉUnion'),
+    'RO' => $t('Romania'),
+    'RS' => $t('Serbia'),
+    'RU' => $t('Russian Federation'),
+    'RW' => $t('Rwanda'),
+    'SA' => $t('Saudi Arabia'),
+    'SB' => $t('Solomon Islands'),
+    'SC' => $t('Seychelles'),
+    'SD' => $t('Sudan'),
+    'SE' => $t('Sweden'),
+    'SG' => $t('Singapore'),
+    'SH' => $t('Saint Helena, Ascension and Tristan Da Cunha'),
+    'SI' => $t('Slovenia'),
+    'SJ' => $t('Svalbard and Jan Mayen'),
+    'SK' => $t('Slovakia'),
+    'SL' => $t('Sierra Leone'),
+    'SM' => $t('San Marino'),
+    'SN' => $t('Senegal'),
+    'SO' => $t('Somalia'),
+    'SR' => $t('Suriname'),
+    'ST' => $t('Sao Tome and Principe'),
+    'SV' => $t('El Salvador'),
+    'SX' => $t('Sint Maarten (Dutch Part)'),
+    'SY' => $t('Syrian Arab Republic'),
+    'SZ' => $t('Swaziland'),
+    'TC' => $t('Turks and Caicos Islands'),
+    'TD' => $t('Chad'),
+    'TF' => $t('French Southern Territories'),
+    'TG' => $t('Togo'),
+    'TH' => $t('Thailand'),
+    'TJ' => $t('Tajikistan'),
+    'TK' => $t('Tokelau'),
+    'TL' => $t('Timor-Leste'),
+    'TM' => $t('Turkmenistan'),
+    'TN' => $t('Tunisia'),
+    'TO' => $t('Tonga'),
+    'TR' => $t('Turkey'),
+    'TT' => $t('Trinidad and Tobago'),
+    'TV' => $t('Tuvalu'),
+    'TW' => $t('Taiwan, Province Of China'),
+    'TZ' => $t('Tanzania, United Republic Of'),
+    'UA' => $t('Ukraine'),
+    'UG' => $t('Uganda'),
+    'UM' => $t('United States Minor Outlying Islands'),
+    'US' => $t('United States'),
+    'UY' => $t('Uruguay'),
+    'UZ' => $t('Uzbekistan'),
+    'VA' => $t('Holy See (Vatican City State)'),
+    'VC' => $t('Saint Vincent and The Grenadines'),
+    'VE' => $t('Venezuela, Bolivarian Republic Of'),
+    'VG' => $t('Virgin Islands, British'),
+    'VI' => $t('Virgin Islands, U.S.'),
+    'VN' => $t('Viet Nam'),
+    'VU' => $t('Vanuatu'),
+    'WF' => $t('Wallis and Futuna'),
+    'WS' => $t('Samoa'),
+    'YE' => $t('Yemen'),
+    'YT' => $t('Mayotte'),
+    'ZA' => $t('South Africa'),
+    'ZM' => $t('Zambia'),
+    'ZW' => $t('Zimbabwe'),
   );
 
   // Sort the list.