Index: supported/cck/nodereference.inc
===================================================================
--- supported/cck/nodereference.inc	(revision 46)
+++ supported/cck/nodereference.inc	(working copy)
@@ -43,11 +43,10 @@
   foreach (node_import_cck_fields($type, 'nodereference') as $fieldname => $fieldinfo) {
     if ($fieldinfo['widget']['type'] == 'nodereference_autocomplete') {
       foreach ($values[$fieldname] as $i => $value) {
-        // This is just braindead - because of some wrapper, the value
-        // needs to be:
-        // array(0 => array('nid' => array('nid' => 'name')))
-        // instead of:
-        // array(0 => array('nid' => 'name')).
+        $values[$fieldname][$i]['nid'] = array('nid' => '[nid:' . $value['nid'] . ']');
+      }
+    } elseif ($fieldinfo['widget']['type'] == 'nodereference_select') {
+      foreach ($values[$fieldname] as $i => $value) {
         $values[$fieldname][$i]['nid'] = array('nid' => $values[$fieldname][$i]['nid']);
       }
     }