diff -urp -N cck_address_old\cck_address.install cck_address\cck_address.install
--- cck_address_old\cck_address.install	Fri Dec 14 15:16:15 2007
+++ cck_address\cck_address.install	Sat Feb 09 14:56:41 2008
@@ -30,8 +30,11 @@ function cck_address_install() {
       }
       if (!db_table_exists('cck_address_countries')) {
         $query3 = db_query("CREATE TABLE {cck_address_countries} (
-                  country_code varchar(2) NOT NULL default '',
+                  country_code char(2) NOT NULL default '',
                   country_name varchar(64) NOT NULL default '',
+                  printable_name VARCHAR(80) NOT NULL default '',
+                  iso3 CHAR(3),
+                  numcode SMALLINT,
                   PRIMARY KEY name_code (country_name, country_code)
                   ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       }
@@ -52,12 +55,19 @@ function cck_address_install() {
         $query3 = db_query("CREATE TABLE {cck_address_countries} (
                   country_code varchar(2) NOT NULL default '',
                   country_name varchar(64) NOT NULL default '',
+                  printable_name VARCHAR(80) NOT NULL default '',
+                  iso3 char(3),
+                  numcode SMALLINT
                   PRIMARY KEY (country_name, country_code)
                   )");
       }
       break;
   }
+
+
   if (!$query1 || !$query3) $query_ok = FALSE;
+  
+  include_once('./'. drupal_get_path('module', 'cck_address') .'/cck_address_country.inc');
 
   include_once('./'. drupal_get_path('module', 'cck_address') .'/cck_address_state.inc');
   
@@ -111,11 +121,14 @@ function cck_address_update_1() {
     case 'mysql':
     case 'mysqli':
       if (!db_table_exists('cck_address_countries')) {
-        $ret[] = $query3 = update_sql("CREATE TABLE {cck_address_countries} (
+        $ret[] = $query3 = db_query("CREATE TABLE {cck_address_countries} (
                   country_code varchar(2) NOT NULL default '',
                   country_name varchar(64) NOT NULL default '',
-                  PRIMARY KEY name_code (country_name, country_code)
-                  ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+                  printable_name VARCHAR(80) NOT NULL default '',
+                  iso3 char(3),
+                  numcode SMALLINT
+                  PRIMARY KEY (country_name, country_code)
+                  )");
       }
       break;
     case 'pgsql':
@@ -241,6 +254,51 @@ $ret = array();
     drupal_set_message('There was an error updating the CCK_Address database table.', 'error');
   }
   return $ret;
+}
+
+/**
+ * Provides list of country codes to the database
+ */
+function cck_address_update_3() {
+  //$q = ""
+  //Drop existing table, create new one.
+  
+  switch ($GLOBALS['db_type']) {
+  case 'mysql':
+    case 'mysqli':
+  $query1 = db_query('DROP TABLE {cck_address_countries}');
+  $query2 = db_query("CREATE TABLE {cck_address_countries} (
+                  country_code char(2) NOT NULL default '',
+                  country_name varchar(64) NOT NULL default '',
+                  printable_name VARCHAR(80) NOT NULL default '',
+                  iso3 CHAR(3),
+                  numcode SMALLINT,
+                  PRIMARY KEY name_code (country_name, country_code)
+                  ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  
+    case 'pgsql':
+      break;
+  }
+  
+  if ($query1 && $query2) {
+    $query_ok = true;
+  }
+  
+  include_once('./'. drupal_get_path('module', 'cck_address') .'/cck_address_country.inc');
+  
+  if ($query_ok) {
+    $ret[] = array(
+      'query' => 'Updated country table with full list of ISO codes',
+      'success' => TRUE,
+    );
+  }
+  else {
+    $ret[] = array(
+      'query' => 'Failed to update country table',
+      'success' => FALSE,
+    );
+  }
+  
 }
 
 /**
diff -urp -N cck_address_old\cck_address.module cck_address\cck_address.module
--- cck_address_old\cck_address.module	Fri Dec 14 15:16:15 2007
+++ cck_address\cck_address.module	Sun Feb 10 03:21:44 2008
@@ -394,26 +394,37 @@ function cck_address_field_settings($op,
         '#default_value' => isset($field['field_defaults_city']) && $field['field_defaults_city'] != '' ? $field['field_defaults_city'] : '',
         '#required' => FALSE,
       );
-      if ($activeselect) {
+      if (isset($field['state_abbrv']) && $field['state_abbrv'] == 2) {
         $form['field_defaults']['field_defaults_state'] = array(
-          '#type' => 'select',
+          '#type' => 'textfield',
           '#title' => t('State'),
-          '#multiple' => FALSE,
-          '#default_value' => isset($field['field_defaults_state']) ? $field['field_defaults_state'] : array(),
+          '#size' => 20,
+          '#default_value' => isset($field['field_defaults_state']) && $field['field_defaults_state'] != '' ? $field['field_defaults_state'] : '',
           '#required' => FALSE,
-          '#options' => array(),
-          '#DANGEROUS_SKIP_CHECK' => TRUE,
         );
       }
       else {
-        $form['field_defaults']['field_defaults_state'] = array(
-          '#type' => 'select',
-          '#title' => t('State'),
-          '#multiple' => FALSE,
-          '#default_value' => isset($field['field_defaults_state']) && $field['field_defaults_state'] != '' ? $field['field_defaults_state'] : '',
-          '#required' => FALSE,
-          '#options' => $state_options,
-        );
+        if ($activeselect) {
+          $form['field_defaults']['field_defaults_state'] = array(
+            '#type' => 'select',
+            '#title' => t('State'),
+            '#multiple' => FALSE,
+            '#default_value' => isset($field['field_defaults_state']) ? $field['field_defaults_state'] : array(),
+            '#required' => FALSE,
+            '#options' => array(),
+            '#DANGEROUS_SKIP_CHECK' => TRUE,
+          );
+        }
+        else {
+          $form['field_defaults']['field_defaults_state'] = array(
+            '#type' => 'select',
+            '#title' => t('State'),
+            '#multiple' => FALSE,
+            '#default_value' => isset($field['field_defaults_state']) && $field['field_defaults_state'] != '' ? $field['field_defaults_state'] : '',
+            '#required' => FALSE,
+            '#options' => $state_options,
+          );
+        }
       }
       $form['field_defaults']['field_defaults_zip'] = array(
         '#type' => 'textfield',
@@ -1106,10 +1117,10 @@ function cck_address_field_formatter($fi
         //get some values to use later
         $cck_address['afd'] = 0;
         $all_countries = array();
-        $sql = "SELECT cas.country_name, cas.country_code FROM {cck_address_countries} cas ORDER BY cas.country_name ASC";
+        $sql = "SELECT cas.printable_name, cas.country_code FROM {cck_address_countries} cas ORDER BY cas.printable_name ASC";
         $results = db_query($sql);
         while ($result = db_fetch_object($results)) {
-          $all_countries[$result->country_code] = $result->country_name;
+          $all_countries[$result->country_code] = $result->printable_name;
         }
         if (isset($field['clist'])) {
           $allowed_countries = $field['clist'];
@@ -1123,7 +1134,8 @@ function cck_address_field_formatter($fi
         }
         
         if ($field['other_countries']) {
-          $country[$item['country']] = $item['country'];
+          // $country[$item['country']] = $item['country']; [no longer the case here because now all countries are pre-listed]
+          $country[$item['country']] = $all_countries[$item['country']];
         }
         else {
           $country[$item['country']] = $all_countries[$item['country']];
@@ -1503,7 +1515,7 @@ function cck_address_widget($op, &$node,
           $form[$field['field_name']][0]['state'] = array(
             '#type' => 'textfield',
             '#title' => isset($field['field_names_state']) ? $field['field_names_state'] : t('State'),
-            '#default_value' => $state,
+            '#default_value' => isset($items[0]['state']) ? $items[0]['state'] : '',
             '#required' => $field['fielddisplay']['field_display_state'] == 'field_display_state' && $field['required'] == TRUE ? TRUE : FALSE,
             '#size' => 20,
             '#maxlength' => $field['max_length_city'] ? $field['max_length_city'] : NULL,
@@ -1540,14 +1552,14 @@ function cck_address_widget($op, &$node,
         
         if ($field['other_countries'] == 1) {
           $form[$field['field_name']][0]['country'] = array(
-            '#type' => 'textfield',
+            '#type' => 'select',
             '#title' => isset($field['field_names_country']) ? $field['field_names_country'] : t('Country'),
-            '#default_value' => isset($items[0]['country']) ? $items[0]['country'] : '',
+            '#default_value' => isset($items[0]['country']) ? array($items[0]['country']) : $field['field_defaults_country'],
             '#required' => $field['fielddisplay']['field_display_country'] == 'field_display_country' && $field['required'] == TRUE ? TRUE : FALSE,
-            '#size' => 20,
             '#maxlength' => $field['max_length_city'] ? $field['max_length_city'] : NULL,
             '#prefix' => '<div class="cck-address-country">',
             '#suffix' => '</div>',
+            '#options' => cck_address_get_countries(),
             );
           $form[$field['field_name']][0]['country']['#attributes'] = $field['max_length_city'] ? array('style' => 'width:' .$field["max_length_city"]*0.85. 'em') : array();
         }
@@ -1808,4 +1820,12 @@ function cck_address_diff_values(&$node,
     }
   }
   return $result;
+}
+
+function cck_address_get_countries() {
+  $result = db_query('SELECT country_code,country_name FROM {cck_address_countries}');
+  while ($row = db_fetch_object($result)) {
+    $countries[$row->country_code] = $row->country_name;
+  }
+  return $countries;
 }
diff -urp -N cck_address_old\cck_address_country.inc cck_address\cck_address_country.inc
--- cck_address_old\cck_address_country.inc	Wed Dec 31 19:00:00 1969
+++ cck_address\cck_address_country.inc	Sat Feb 09 14:48:07 2008
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Taken from http://27.org/isocountrylist/iso_country_list.sql
+ * # This will create and then populate a MySQL table with a list of the names and
+ * # ISO 3166 codes for countries in existence as of the date below.
+ * # # Usage: # mysql -u username -ppassword database_name < ./iso_country_list.sql 
+ * # # For updates to this file, see http://27.org/isocountrylist/ 
+ * # For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html 
+ * # # Created by getisocountrylist.pl on Sun Nov 2 14:59:20 2003. # Wm. Rhodes #
+ * 
+ * * $Id: cck_address_country.inc,v 0
+ */
+$country_inserts = array (
+"INSERT INTO {cck_address_countries} VALUES ('US','UNITED STATES','United States','USA','840');",
+"INSERT INTO {cck_address_countries} VALUES ('AF','AFGHANISTAN','Afghanistan','AFG','004');",
+"INSERT INTO {cck_address_countries} VALUES ('AL','ALBANIA','Albania','ALB','008');",
+"INSERT INTO {cck_address_countries} VALUES ('DZ','ALGERIA','Algeria','DZA','012');",
+"INSERT INTO {cck_address_countries} VALUES ('AS','AMERICAN SAMOA','American Samoa','ASM','016');",
+"INSERT INTO {cck_address_countries} VALUES ('AD','ANDORRA','Andorra','AND','020');",
+"INSERT INTO {cck_address_countries} VALUES ('AO','ANGOLA','Angola','AGO','024');",
+"INSERT INTO {cck_address_countries} VALUES ('AI','ANGUILLA','Anguilla','AIA','660');",
+"INSERT INTO {cck_address_countries} VALUES ('AQ','ANTARCTICA','Antarctica',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('AG','ANTIGUA AND BARBUDA','Antigua and Barbuda','ATG','028');",
+"INSERT INTO {cck_address_countries} VALUES ('AR','ARGENTINA','Argentina','ARG','032');",
+"INSERT INTO {cck_address_countries} VALUES ('AM','ARMENIA','Armenia','ARM','051');",
+"INSERT INTO {cck_address_countries} VALUES ('AW','ARUBA','Aruba','ABW','533');",
+"INSERT INTO {cck_address_countries} VALUES ('AU','AUSTRALIA','Australia','AUS','036');",
+"INSERT INTO {cck_address_countries} VALUES ('AT','AUSTRIA','Austria','AUT','040');",
+"INSERT INTO {cck_address_countries} VALUES ('AZ','AZERBAIJAN','Azerbaijan','AZE','031');",
+"INSERT INTO {cck_address_countries} VALUES ('BS','BAHAMAS','Bahamas','BHS','044');",
+"INSERT INTO {cck_address_countries} VALUES ('BH','BAHRAIN','Bahrain','BHR','048');",
+"INSERT INTO {cck_address_countries} VALUES ('BD','BANGLADESH','Bangladesh','BGD','050');",
+"INSERT INTO {cck_address_countries} VALUES ('BB','BARBADOS','Barbados','BRB','052');",
+"INSERT INTO {cck_address_countries} VALUES ('BY','BELARUS','Belarus','BLR','112');",
+"INSERT INTO {cck_address_countries} VALUES ('BE','BELGIUM','Belgium','BEL','056');",
+"INSERT INTO {cck_address_countries} VALUES ('BZ','BELIZE','Belize','BLZ','084');",
+"INSERT INTO {cck_address_countries} VALUES ('BJ','BENIN','Benin','BEN','204');",
+"INSERT INTO {cck_address_countries} VALUES ('BM','BERMUDA','Bermuda','BMU','060');",
+"INSERT INTO {cck_address_countries} VALUES ('BT','BHUTAN','Bhutan','BTN','064');",
+"INSERT INTO {cck_address_countries} VALUES ('BO','BOLIVIA','Bolivia','BOL','068');",
+"INSERT INTO {cck_address_countries} VALUES ('BA','BOSNIA AND HERZEGOVINA','Bosnia and Herzegovina','BIH','070');",
+"INSERT INTO {cck_address_countries} VALUES ('BW','BOTSWANA','Botswana','BWA','072');",
+"INSERT INTO {cck_address_countries} VALUES ('BV','BOUVET ISLAND','Bouvet Island',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('BR','BRAZIL','Brazil','BRA','076');",
+"INSERT INTO {cck_address_countries} VALUES ('IO','BRITISH INDIAN OCEAN TERRITORY','British Indian Ocean Territory',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('BN','BRUNEI DARUSSALAM','Brunei Darussalam','BRN','096');",
+"INSERT INTO {cck_address_countries} VALUES ('BG','BULGARIA','Bulgaria','BGR','100');",
+"INSERT INTO {cck_address_countries} VALUES ('BF','BURKINA FASO','Burkina Faso','BFA','854');",
+"INSERT INTO {cck_address_countries} VALUES ('BI','BURUNDI','Burundi','BDI','108');",
+"INSERT INTO {cck_address_countries} VALUES ('KH','CAMBODIA','Cambodia','KHM','116');",
+"INSERT INTO {cck_address_countries} VALUES ('CM','CAMEROON','Cameroon','CMR','120');",
+"INSERT INTO {cck_address_countries} VALUES ('CA','CANADA','Canada','CAN','124');",
+"INSERT INTO {cck_address_countries} VALUES ('CV','CAPE VERDE','Cape Verde','CPV','132');",
+"INSERT INTO {cck_address_countries} VALUES ('KY','CAYMAN ISLANDS','Cayman Islands','CYM','136');",
+"INSERT INTO {cck_address_countries} VALUES ('CF','CENTRAL AFRICAN REPUBLIC','Central African Republic','CAF','140');",
+"INSERT INTO {cck_address_countries} VALUES ('TD','CHAD','Chad','TCD','148');",
+"INSERT INTO {cck_address_countries} VALUES ('CL','CHILE','Chile','CHL','152');",
+"INSERT INTO {cck_address_countries} VALUES ('CN','CHINA','China','CHN','156');",
+"INSERT INTO {cck_address_countries} VALUES ('CX','CHRISTMAS ISLAND','Christmas Island',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('CC','COCOS (KEELING) ISLANDS','Cocos (Keeling) Islands',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('CO','COLOMBIA','Colombia','COL','170');",
+"INSERT INTO {cck_address_countries} VALUES ('KM','COMOROS','Comoros','COM','174');",
+"INSERT INTO {cck_address_countries} VALUES ('CG','CONGO','Congo','COG','178');",
+"INSERT INTO {cck_address_countries} VALUES ('CD','CONGO, THE DEMOCRATIC REPUBLIC OF THE','Congo, the Democratic Republic of the','COD','180');",
+"INSERT INTO {cck_address_countries} VALUES ('CK','COOK ISLANDS','Cook Islands','COK','184');",
+"INSERT INTO {cck_address_countries} VALUES ('CR','COSTA RICA','Costa Rica','CRI','188');",
+"INSERT INTO {cck_address_countries} VALUES ('CI','COTE D\'IVOIRE','Cote D\'Ivoire','CIV','384');",
+"INSERT INTO {cck_address_countries} VALUES ('HR','CROATIA','Croatia','HRV','191');",
+"INSERT INTO {cck_address_countries} VALUES ('CU','CUBA','Cuba','CUB','192');",
+"INSERT INTO {cck_address_countries} VALUES ('CY','CYPRUS','Cyprus','CYP','196');",
+"INSERT INTO {cck_address_countries} VALUES ('CZ','CZECH REPUBLIC','Czech Republic','CZE','203');",
+"INSERT INTO {cck_address_countries} VALUES ('DK','DENMARK','Denmark','DNK','208');",
+"INSERT INTO {cck_address_countries} VALUES ('DJ','DJIBOUTI','Djibouti','DJI','262');",
+"INSERT INTO {cck_address_countries} VALUES ('DM','DOMINICA','Dominica','DMA','212');",
+"INSERT INTO {cck_address_countries} VALUES ('DO','DOMINICAN REPUBLIC','Dominican Republic','DOM','214');",
+"INSERT INTO {cck_address_countries} VALUES ('EC','ECUADOR','Ecuador','ECU','218');",
+"INSERT INTO {cck_address_countries} VALUES ('EG','EGYPT','Egypt','EGY','818');",
+"INSERT INTO {cck_address_countries} VALUES ('SV','EL SALVADOR','El Salvador','SLV','222');",
+"INSERT INTO {cck_address_countries} VALUES ('GQ','EQUATORIAL GUINEA','Equatorial Guinea','GNQ','226');",
+"INSERT INTO {cck_address_countries} VALUES ('ER','ERITREA','Eritrea','ERI','232');",
+"INSERT INTO {cck_address_countries} VALUES ('EE','ESTONIA','Estonia','EST','233');",
+"INSERT INTO {cck_address_countries} VALUES ('ET','ETHIOPIA','Ethiopia','ETH','231');",
+"INSERT INTO {cck_address_countries} VALUES ('FK','FALKLAND ISLANDS (MALVINAS)','Falkland Islands (Malvinas)','FLK','238');",
+"INSERT INTO {cck_address_countries} VALUES ('FO','FAROE ISLANDS','Faroe Islands','FRO','234');",
+"INSERT INTO {cck_address_countries} VALUES ('FJ','FIJI','Fiji','FJI','242');",
+"INSERT INTO {cck_address_countries} VALUES ('FI','FINLAND','Finland','FIN','246');",
+"INSERT INTO {cck_address_countries} VALUES ('FR','FRANCE','France','FRA','250');",
+"INSERT INTO {cck_address_countries} VALUES ('GF','FRENCH GUIANA','French Guiana','GUF','254');",
+"INSERT INTO {cck_address_countries} VALUES ('PF','FRENCH POLYNESIA','French Polynesia','PYF','258');",
+"INSERT INTO {cck_address_countries} VALUES ('TF','FRENCH SOUTHERN TERRITORIES','French Southern Territories',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('GA','GABON','Gabon','GAB','266');",
+"INSERT INTO {cck_address_countries} VALUES ('GM','GAMBIA','Gambia','GMB','270');",
+"INSERT INTO {cck_address_countries} VALUES ('GE','GEORGIA','Georgia','GEO','268');",
+"INSERT INTO {cck_address_countries} VALUES ('DE','GERMANY','Germany','DEU','276');",
+"INSERT INTO {cck_address_countries} VALUES ('GH','GHANA','Ghana','GHA','288');",
+"INSERT INTO {cck_address_countries} VALUES ('GI','GIBRALTAR','Gibraltar','GIB','292');",
+"INSERT INTO {cck_address_countries} VALUES ('GR','GREECE','Greece','GRC','300');",
+"INSERT INTO {cck_address_countries} VALUES ('GL','GREENLAND','Greenland','GRL','304');",
+"INSERT INTO {cck_address_countries} VALUES ('GD','GRENADA','Grenada','GRD','308');",
+"INSERT INTO {cck_address_countries} VALUES ('GP','GUADELOUPE','Guadeloupe','GLP','312');",
+"INSERT INTO {cck_address_countries} VALUES ('GU','GUAM','Guam','GUM','316');",
+"INSERT INTO {cck_address_countries} VALUES ('GT','GUATEMALA','Guatemala','GTM','320');",
+"INSERT INTO {cck_address_countries} VALUES ('GN','GUINEA','Guinea','GIN','324');",
+"INSERT INTO {cck_address_countries} VALUES ('GW','GUINEA-BISSAU','Guinea-Bissau','GNB','624');",
+"INSERT INTO {cck_address_countries} VALUES ('GY','GUYANA','Guyana','GUY','328');",
+"INSERT INTO {cck_address_countries} VALUES ('HT','HAITI','Haiti','HTI','332');",
+"INSERT INTO {cck_address_countries} VALUES ('HM','HEARD ISLAND AND MCDONALD ISLANDS','Heard Island and Mcdonald Islands',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('VA','HOLY SEE (VATICAN CITY STATE)','Holy See (Vatican City State)','VAT','336');",
+"INSERT INTO {cck_address_countries} VALUES ('HN','HONDURAS','Honduras','HND','340');",
+"INSERT INTO {cck_address_countries} VALUES ('HK','HONG KONG','Hong Kong','HKG','344');",
+"INSERT INTO {cck_address_countries} VALUES ('HU','HUNGARY','Hungary','HUN','348');",
+"INSERT INTO {cck_address_countries} VALUES ('IS','ICELAND','Iceland','ISL','352');",
+"INSERT INTO {cck_address_countries} VALUES ('IN','INDIA','India','IND','356');",
+"INSERT INTO {cck_address_countries} VALUES ('ID','INDONESIA','Indonesia','IDN','360');",
+"INSERT INTO {cck_address_countries} VALUES ('IR','IRAN, ISLAMIC REPUBLIC OF','Iran, Islamic Republic of','IRN','364');",
+"INSERT INTO {cck_address_countries} VALUES ('IQ','IRAQ','Iraq','IRQ','368');",
+"INSERT INTO {cck_address_countries} VALUES ('IE','IRELAND','Ireland','IRL','372');",
+"INSERT INTO {cck_address_countries} VALUES ('IL','ISRAEL','Israel','ISR','376');",
+"INSERT INTO {cck_address_countries} VALUES ('IT','ITALY','Italy','ITA','380');",
+"INSERT INTO {cck_address_countries} VALUES ('JM','JAMAICA','Jamaica','JAM','388');",
+"INSERT INTO {cck_address_countries} VALUES ('JP','JAPAN','Japan','JPN','392');",
+"INSERT INTO {cck_address_countries} VALUES ('JO','JORDAN','Jordan','JOR','400');",
+"INSERT INTO {cck_address_countries} VALUES ('KZ','KAZAKHSTAN','Kazakhstan','KAZ','398');",
+"INSERT INTO {cck_address_countries} VALUES ('KE','KENYA','Kenya','KEN','404');",
+"INSERT INTO {cck_address_countries} VALUES ('KI','KIRIBATI','Kiribati','KIR','296');",
+"INSERT INTO {cck_address_countries} VALUES ('KP','KOREA, DEMOCRATIC PEOPLE\'S REPUBLIC OF','Korea, Democratic People\'s Republic of','PRK','408');",
+"INSERT INTO {cck_address_countries} VALUES ('KR','KOREA, REPUBLIC OF','Korea, Republic of','KOR','410');",
+"INSERT INTO {cck_address_countries} VALUES ('KW','KUWAIT','Kuwait','KWT','414');",
+"INSERT INTO {cck_address_countries} VALUES ('KG','KYRGYZSTAN','Kyrgyzstan','KGZ','417');",
+"INSERT INTO {cck_address_countries} VALUES ('LA','LAO PEOPLE\'S DEMOCRATIC REPUBLIC','Lao People\'s Democratic Republic','LAO','418');",
+"INSERT INTO {cck_address_countries} VALUES ('LV','LATVIA','Latvia','LVA','428');",
+"INSERT INTO {cck_address_countries} VALUES ('LB','LEBANON','Lebanon','LBN','422');",
+"INSERT INTO {cck_address_countries} VALUES ('LS','LESOTHO','Lesotho','LSO','426');",
+"INSERT INTO {cck_address_countries} VALUES ('LR','LIBERIA','Liberia','LBR','430');",
+"INSERT INTO {cck_address_countries} VALUES ('LY','LIBYAN ARAB JAMAHIRIYA','Libyan Arab Jamahiriya','LBY','434');",
+"INSERT INTO {cck_address_countries} VALUES ('LI','LIECHTENSTEIN','Liechtenstein','LIE','438');",
+"INSERT INTO {cck_address_countries} VALUES ('LT','LITHUANIA','Lithuania','LTU','440');",
+"INSERT INTO {cck_address_countries} VALUES ('LU','LUXEMBOURG','Luxembourg','LUX','442');",
+"INSERT INTO {cck_address_countries} VALUES ('MO','MACAO','Macao','MAC','446');",
+"INSERT INTO {cck_address_countries} VALUES ('MK','MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF','Macedonia, the Former Yugoslav Republic of','MKD','807');",
+"INSERT INTO {cck_address_countries} VALUES ('MG','MADAGASCAR','Madagascar','MDG','450');",
+"INSERT INTO {cck_address_countries} VALUES ('MW','MALAWI','Malawi','MWI','454');",
+"INSERT INTO {cck_address_countries} VALUES ('MY','MALAYSIA','Malaysia','MYS','458');",
+"INSERT INTO {cck_address_countries} VALUES ('MV','MALDIVES','Maldives','MDV','462');",
+"INSERT INTO {cck_address_countries} VALUES ('ML','MALI','Mali','MLI','466');",
+"INSERT INTO {cck_address_countries} VALUES ('MT','MALTA','Malta','MLT','470');",
+"INSERT INTO {cck_address_countries} VALUES ('MH','MARSHALL ISLANDS','Marshall Islands','MHL','584');",
+"INSERT INTO {cck_address_countries} VALUES ('MQ','MARTINIQUE','Martinique','MTQ','474');",
+"INSERT INTO {cck_address_countries} VALUES ('MR','MAURITANIA','Mauritania','MRT','478');",
+"INSERT INTO {cck_address_countries} VALUES ('MU','MAURITIUS','Mauritius','MUS','480');",
+"INSERT INTO {cck_address_countries} VALUES ('YT','MAYOTTE','Mayotte',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('MX','MEXICO','Mexico','MEX','484');",
+"INSERT INTO {cck_address_countries} VALUES ('FM','MICRONESIA, FEDERATED STATES OF','Micronesia, Federated States of','FSM','583');",
+"INSERT INTO {cck_address_countries} VALUES ('MD','MOLDOVA, REPUBLIC OF','Moldova, Republic of','MDA','498');",
+"INSERT INTO {cck_address_countries} VALUES ('MC','MONACO','Monaco','MCO','492');",
+"INSERT INTO {cck_address_countries} VALUES ('MN','MONGOLIA','Mongolia','MNG','496');",
+"INSERT INTO {cck_address_countries} VALUES ('MS','MONTSERRAT','Montserrat','MSR','500');",
+"INSERT INTO {cck_address_countries} VALUES ('MA','MOROCCO','Morocco','MAR','504');",
+"INSERT INTO {cck_address_countries} VALUES ('MZ','MOZAMBIQUE','Mozambique','MOZ','508');",
+"INSERT INTO {cck_address_countries} VALUES ('MM','MYANMAR','Myanmar','MMR','104');",
+"INSERT INTO {cck_address_countries} VALUES ('NA','NAMIBIA','Namibia','NAM','516');",
+"INSERT INTO {cck_address_countries} VALUES ('NR','NAURU','Nauru','NRU','520');",
+"INSERT INTO {cck_address_countries} VALUES ('NP','NEPAL','Nepal','NPL','524');",
+"INSERT INTO {cck_address_countries} VALUES ('NL','NETHERLANDS','Netherlands','NLD','528');",
+"INSERT INTO {cck_address_countries} VALUES ('AN','NETHERLANDS ANTILLES','Netherlands Antilles','ANT','530');",
+"INSERT INTO {cck_address_countries} VALUES ('NC','NEW CALEDONIA','New Caledonia','NCL','540');",
+"INSERT INTO {cck_address_countries} VALUES ('NZ','NEW ZEALAND','New Zealand','NZL','554');",
+"INSERT INTO {cck_address_countries} VALUES ('NI','NICARAGUA','Nicaragua','NIC','558');",
+"INSERT INTO {cck_address_countries} VALUES ('NE','NIGER','Niger','NER','562');",
+"INSERT INTO {cck_address_countries} VALUES ('NG','NIGERIA','Nigeria','NGA','566');",
+"INSERT INTO {cck_address_countries} VALUES ('NU','NIUE','Niue','NIU','570');",
+"INSERT INTO {cck_address_countries} VALUES ('NF','NORFOLK ISLAND','Norfolk Island','NFK','574');",
+"INSERT INTO {cck_address_countries} VALUES ('MP','NORTHERN MARIANA ISLANDS','Northern Mariana Islands','MNP','580');",
+"INSERT INTO {cck_address_countries} VALUES ('NO','NORWAY','Norway','NOR','578');",
+"INSERT INTO {cck_address_countries} VALUES ('OM','OMAN','Oman','OMN','512');",
+"INSERT INTO {cck_address_countries} VALUES ('PK','PAKISTAN','Pakistan','PAK','586');",
+"INSERT INTO {cck_address_countries} VALUES ('PW','PALAU','Palau','PLW','585');",
+"INSERT INTO {cck_address_countries} VALUES ('PA','PANAMA','Panama','PAN','591');",
+"INSERT INTO {cck_address_countries} VALUES ('PG','PAPUA NEW GUINEA','Papua New Guinea','PNG','598');",
+"INSERT INTO {cck_address_countries} VALUES ('PY','PARAGUAY','Paraguay','PRY','600');",
+"INSERT INTO {cck_address_countries} VALUES ('PE','PERU','Peru','PER','604');",
+"INSERT INTO {cck_address_countries} VALUES ('PH','PHILIPPINES','Philippines','PHL','608');",
+"INSERT INTO {cck_address_countries} VALUES ('PN','PITCAIRN','Pitcairn','PCN','612');",
+"INSERT INTO {cck_address_countries} VALUES ('PL','POLAND','Poland','POL','616');",
+"INSERT INTO {cck_address_countries} VALUES ('PT','PORTUGAL','Portugal','PRT','620');",
+"INSERT INTO {cck_address_countries} VALUES ('PR','PUERTO RICO','Puerto Rico','PRI','630');",
+"INSERT INTO {cck_address_countries} VALUES ('QA','QATAR','Qatar','QAT','634');",
+"INSERT INTO {cck_address_countries} VALUES ('RE','REUNION','Reunion','REU','638');",
+"INSERT INTO {cck_address_countries} VALUES ('RO','ROMANIA','Romania','ROM','642');",
+"INSERT INTO {cck_address_countries} VALUES ('RU','RUSSIAN FEDERATION','Russian Federation','RUS','643');",
+"INSERT INTO {cck_address_countries} VALUES ('RW','RWANDA','Rwanda','RWA','646');",
+"INSERT INTO {cck_address_countries} VALUES ('SH','SAINT HELENA','Saint Helena','SHN','654');",
+"INSERT INTO {cck_address_countries} VALUES ('KN','SAINT KITTS AND NEVIS','Saint Kitts and Nevis','KNA','659');",
+"INSERT INTO {cck_address_countries} VALUES ('LC','SAINT LUCIA','Saint Lucia','LCA','662');",
+"INSERT INTO {cck_address_countries} VALUES ('PM','SAINT PIERRE AND MIQUELON','Saint Pierre and Miquelon','SPM','666');",
+"INSERT INTO {cck_address_countries} VALUES ('VC','SAINT VINCENT AND THE GRENADINES','Saint Vincent and the Grenadines','VCT','670');",
+"INSERT INTO {cck_address_countries} VALUES ('WS','SAMOA','Samoa','WSM','882');",
+"INSERT INTO {cck_address_countries} VALUES ('SM','SAN MARINO','San Marino','SMR','674');",
+"INSERT INTO {cck_address_countries} VALUES ('ST','SAO TOME AND PRINCIPE','Sao Tome and Principe','STP','678');",
+"INSERT INTO {cck_address_countries} VALUES ('SA','SAUDI ARABIA','Saudi Arabia','SAU','682');",
+"INSERT INTO {cck_address_countries} VALUES ('SN','SENEGAL','Senegal','SEN','686');",
+"INSERT INTO {cck_address_countries} VALUES ('CS','SERBIA AND MONTENEGRO','Serbia and Montenegro',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('SC','SEYCHELLES','Seychelles','SYC','690');",
+"INSERT INTO {cck_address_countries} VALUES ('SL','SIERRA LEONE','Sierra Leone','SLE','694');",
+"INSERT INTO {cck_address_countries} VALUES ('SG','SINGAPORE','Singapore','SGP','702');",
+"INSERT INTO {cck_address_countries} VALUES ('SK','SLOVAKIA','Slovakia','SVK','703');",
+"INSERT INTO {cck_address_countries} VALUES ('SI','SLOVENIA','Slovenia','SVN','705');",
+"INSERT INTO {cck_address_countries} VALUES ('SB','SOLOMON ISLANDS','Solomon Islands','SLB','090');",
+"INSERT INTO {cck_address_countries} VALUES ('SO','SOMALIA','Somalia','SOM','706');",
+"INSERT INTO {cck_address_countries} VALUES ('ZA','SOUTH AFRICA','South Africa','ZAF','710');",
+"INSERT INTO {cck_address_countries} VALUES ('GS','SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS','South Georgia and the South Sandwich Islands',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('ES','SPAIN','Spain','ESP','724');",
+"INSERT INTO {cck_address_countries} VALUES ('LK','SRI LANKA','Sri Lanka','LKA','144');",
+"INSERT INTO {cck_address_countries} VALUES ('SD','SUDAN','Sudan','SDN','736');",
+"INSERT INTO {cck_address_countries} VALUES ('SR','SURINAME','Suriname','SUR','740');",
+"INSERT INTO {cck_address_countries} VALUES ('SJ','SVALBARD AND JAN MAYEN','Svalbard and Jan Mayen','SJM','744');",
+"INSERT INTO {cck_address_countries} VALUES ('SZ','SWAZILAND','Swaziland','SWZ','748');",
+"INSERT INTO {cck_address_countries} VALUES ('SE','SWEDEN','Sweden','SWE','752');",
+"INSERT INTO {cck_address_countries} VALUES ('CH','SWITZERLAND','Switzerland','CHE','756');",
+"INSERT INTO {cck_address_countries} VALUES ('SY','SYRIAN ARAB REPUBLIC','Syrian Arab Republic','SYR','760');",
+"INSERT INTO {cck_address_countries} VALUES ('TW','TAIWAN, PROVINCE OF CHINA','Taiwan, Province of China','TWN','158');",
+"INSERT INTO {cck_address_countries} VALUES ('TJ','TAJIKISTAN','Tajikistan','TJK','762');",
+"INSERT INTO {cck_address_countries} VALUES ('TZ','TANZANIA, UNITED REPUBLIC OF','Tanzania, United Republic of','TZA','834');",
+"INSERT INTO {cck_address_countries} VALUES ('TH','THAILAND','Thailand','THA','764');",
+"INSERT INTO {cck_address_countries} VALUES ('TL','TIMOR-LESTE','Timor-Leste',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('TG','TOGO','Togo','TGO','768');",
+"INSERT INTO {cck_address_countries} VALUES ('TK','TOKELAU','Tokelau','TKL','772');",
+"INSERT INTO {cck_address_countries} VALUES ('TO','TONGA','Tonga','TON','776');",
+"INSERT INTO {cck_address_countries} VALUES ('TT','TRINIDAD AND TOBAGO','Trinidad and Tobago','TTO','780');",
+"INSERT INTO {cck_address_countries} VALUES ('TN','TUNISIA','Tunisia','TUN','788');",
+"INSERT INTO {cck_address_countries} VALUES ('TR','TURKEY','Turkey','TUR','792');",
+"INSERT INTO {cck_address_countries} VALUES ('TM','TURKMENISTAN','Turkmenistan','TKM','795');",
+"INSERT INTO {cck_address_countries} VALUES ('TC','TURKS AND CAICOS ISLANDS','Turks and Caicos Islands','TCA','796');",
+"INSERT INTO {cck_address_countries} VALUES ('TV','TUVALU','Tuvalu','TUV','798');",
+"INSERT INTO {cck_address_countries} VALUES ('UG','UGANDA','Uganda','UGA','800');",
+"INSERT INTO {cck_address_countries} VALUES ('UA','UKRAINE','Ukraine','UKR','804');",
+"INSERT INTO {cck_address_countries} VALUES ('AE','UNITED ARAB EMIRATES','United Arab Emirates','ARE','784');",
+"INSERT INTO {cck_address_countries} VALUES ('GB','UNITED KINGDOM','United Kingdom','GBR','826');",
+"INSERT INTO {cck_address_countries} VALUES ('UM','UNITED STATES MINOR OUTLYING ISLANDS','United States Minor Outlying Islands',NULL,NULL);",
+"INSERT INTO {cck_address_countries} VALUES ('UY','URUGUAY','Uruguay','URY','858');",
+"INSERT INTO {cck_address_countries} VALUES ('UZ','UZBEKISTAN','Uzbekistan','UZB','860');",
+"INSERT INTO {cck_address_countries} VALUES ('VU','VANUATU','Vanuatu','VUT','548');",
+"INSERT INTO {cck_address_countries} VALUES ('VE','VENEZUELA','Venezuela','VEN','862');",
+"INSERT INTO {cck_address_countries} VALUES ('VN','VIET NAM','Viet Nam','VNM','704');",
+"INSERT INTO {cck_address_countries} VALUES ('VG','VIRGIN ISLANDS, BRITISH','Virgin Islands, British','VGB','092');",
+"INSERT INTO {cck_address_countries} VALUES ('VI','VIRGIN ISLANDS, U.S.','Virgin Islands, U.s.','VIR','850');",
+"INSERT INTO {cck_address_countries} VALUES ('WF','WALLIS AND FUTUNA','Wallis and Futuna','WLF','876');",
+"INSERT INTO {cck_address_countries} VALUES ('EH','WESTERN SAHARA','Western Sahara','ESH','732');",
+"INSERT INTO {cck_address_countries} VALUES ('YE','YEMEN','Yemen','YEM','887');",
+"INSERT INTO {cck_address_countries} VALUES ('ZM','ZAMBIA','Zambia','ZMB','894');",
+"INSERT INTO {cck_address_countries} VALUES ('ZW','ZIMBABWE','Zimbabwe','ZWE','716');",
+);
+
+foreach ($country_inserts as $sql) {
+  $result = db_query($sql);
+  if ($result == false) {
+    $query_ok = FALSE;
+  }
+}
+
+?>
\ No newline at end of file
diff -urp -N cck_address_old\cck_address_state.inc cck_address\cck_address_state.inc
--- cck_address_old\cck_address_state.inc	Fri Dec 14 15:16:15 2007
+++ cck_address\cck_address_state.inc	Sat Feb 09 14:52:20 2008
@@ -105,6 +105,4 @@ if (!$query2) $query_ok = FALSE;
 $query2 = db_query("INSERT INTO {cck_address_states} (state_name, state_abbrv, country_code) VALUES ('Wisconsin', 'WI', 'US')");
 if (!$query2) $query_ok = FALSE;
 $query2 = db_query("INSERT INTO {cck_address_states} (state_name, state_abbrv, country_code) VALUES ('Wyoming', 'WY', 'US')");
-if (!$query2) $query_ok = FALSE;
-$query2 = db_query("INSERT INTO {cck_address_countries} (country_name, country_code) VALUES ('United States', 'US')");
 if (!$query2) $query_ok = FALSE;