Index: content_profile.migrate.inc
===================================================================
--- content_profile.migrate.inc	(revision 329)
+++ content_profile.migrate.inc	(working copy)
@@ -35,8 +35,10 @@
   $cp_fields = array();
   foreach ($cp_types as $type => $info) {
     $cp_fields[$type] = content_migrate_fields_node($type);
-    $node[$type] = new StdClass;
-    $node[$type]->type = $type;
+    if (!$node[$type] = content_profile_load($type, $account->uid)) {
+      $node[$type] = new StdClass;
+      $node[$type]->type = $type;
+    }
   }
 
   // Process all CCK fields in the input as content_profile
@@ -45,7 +47,9 @@
     if (strpos($destfield, '|') !== FALSE) {
       $pieces = explode('|', $destfield);
       $type = $pieces[0];
-      $destfield = $pieces[1];
+      // The field name is passed in as something like field_something_value, but we want
+      // it in the form field_something['0']['value'], so we crop off the '_value' part here.
+      $destfield = substr($pieces[1], 0, -6);
     }
     if ($values['srcfield'] && isset($row->$values['srcfield'])) {
       $newvalue = $row->$values['srcfield'];
@@ -54,17 +58,22 @@
       $newvalue = $values['default_value'];
     }
     if (isset($type)) {
-      $node[$type]->$destfield = $newvalue;
+      $node[$type]->$destfield = array('0' => array('value' => $newvalue));
     }
   }
 
-  // For each profile type, create the node attached to this user
+  // For each profile type, create or update the node attached to this user
   foreach ($cp_types as $type => $name) {
     $node[$type]->uid = $account->uid;
     if (!isset($node[$type]->title)) {
       $node[$type]->title = $account->name;
     }
     $node[$type]->name = $account->name;
+    // Create a new revision if this profile is being updated
+    if ($node[$type]->nid) {
+      $node[$type]->revision = 1;
+      $node[$type]->log = t('Updated by Migrate.');
+    }
     // Create the node.
     // Prepare the node for import. We could have written the following loop
     // as: module_invoke_all('node_import_prepare', $node, $preview > 0);
