Index: uc_usps.countries.inc
===================================================================
--- uc_usps.countries.inc
+++ uc_usps.countries.inc
@@ -11,23 +11,116 @@
  */
 function uc_usps_country_map($code = NULL) {
   $countries = array(
-    92 => 'British Virgin Islands',
-    268 => 'Georgia, Republic of',
-    826 => 'Great Britain and Northern Ireland',
+    4 => 'Afghanistan',
+    20 => 'Andorra',
+    28 => 'Antigua and Barbuda',
+    32 => 'Argentina',
+    51 => 'Armenia',
+    533 => 'Aruba',
+    36 => 'Australia',
+    40 => 'Austria',
+    44 => 'Bahamas',
+    52 => 'Barbados',
+    56 => 'Belgium',
+    84 => 'Belize',
+    60 => 'Bermuda',
+    70 => 'Bosnia and Herzegovina',
+    72 => 'Botswana',
+    76 => 'Brazil',
+    100 => 'Bulgaria',
+    116 => 'Cambodia',
+    152 => 'Chile',
+    156 => 'China',
+    170 => 'Colombia',
+    188 => 'Costa Rica',
+    191 => 'Croatia',
+    203 => 'Czech',
+    208 => 'Denmark',
+    214 => 'Dominican Republic',
+    218 => 'Ecuador',
+    818 => 'Egypt',
+    222 => 'El Salvador',
+    233 => 'Estonia',
+    246 => 'Finland',
+    250 => 'France',
+    268 => 'Georgia',
+    276 => 'Germany',
+    292 => 'Gibraltar',
     300 => 'Greece',
+    304 => 'Greenland',
+    316 => 'Guam',
+    344 => 'Hong Kong',
+    348 => 'Hungary',
+    356 => 'India',
+    360 => 'Indonesia',
     364 => 'Iran',
-    833 => 'Isle of Man (Great Britain)',
-    410 => 'Korea, Republic of (South Korea)',
+    372 => 'Ireland',
+    833 => 'Isle of Man',
+    376 => 'Israel',
+    380 => 'Italy',
+    388 => 'Jamaica',
+    392 => 'Japan',
+    398 => 'Kazakhstan',
+    404 => 'Kenya',
+    410 => 'Korea, Republic of',
     428 => 'Latvia',
     440 => 'Lithuania',
-    492 => 'Monaco (France)',
-    104 => 'Myanmar (Burma)',
+    442 => 'Luxembourg',
+    446 => 'Macao',
+    807 => 'Macedonia',
+    458 => 'Malaysia',
+    470 => 'Malta',
+    480 => 'Mauritius',
+    484 => 'Mexico',
+    492 => 'Monaco',
+    499 => 'Montenegro',
+    504 => 'Morocco',
+    508 => 'Mozambique',
+    104 => 'Myanmar',
+    524 => 'Nepal',
+    528 => 'Netherlands',
+    540 => 'New Caledonia',
+    554 => 'New Zealand',
+    558 => 'Nicaragua',
+    566 => 'Nigeria',
+    578 => 'Norway',
+    512 => 'Oman',
+    591 => 'Panama',
     604 => 'Peru',
+    608 => 'Philippines',
+    616 => 'Poland',
+    620 => 'Portugal',
+    630 => 'Puerto Rico',
+    638 => 'Reunion',
+    642 => 'Romania',
     643 => 'Russia',
-    688 => 'Serbia-Montenegro',
+    662 => 'Saint Lucia',
+    686 => 'Senegal',
+    688 => 'Serbia',
+    690 => 'Seychelles',
+    702 => 'Singapore',
     703 => 'Slovak Republic',
+    705 => 'Slovenia',
+    710 => 'South Africa',
+    724 => 'Spain',
+    144 => 'Sri Lanka',
+    740 => 'Suriname',
+    752 => 'Sweden',
+    756 => 'Switzerland',
+    158 => 'Taiwan',
+    834 => 'Tanzania',
+    764 => 'Thailand',
+    788 => 'Tunisia',
     792 => 'Turkey',
     804 => 'Ukraine',
+    784 => 'United Arab Emirates',
+    826 => 'United Kingdom',
+    858 => 'Uruguay',
+    862 => 'Venezuela',
+    704 => 'Vietnam',
+    92 => 'Virgin Islands British',
+    850 => 'Virgin Islands US',
+    716 => 'Zimbabwe',
   );
 
   if ($code) {