diff --git a/node_reference/node_reference.module b/node_reference/node_reference.module
index 0768ff3..409d9d8 100644
--- a/node_reference/node_reference.module
+++ b/node_reference/node_reference.module
@@ -1053,3 +1053,34 @@ function node_reference_views_options($field_name) {
   }
   return array();
 }
+
+/**
+ * Implements hook_token_info().
+ */
+function node_reference_token_info() {
+
+  $info['types']['node-reference-field'] = array(
+    'name' => t('Node reference fields'),
+    'description' => t('Tokens related to node reference field instances.'),
++      'needs-data' => 'node-reference-field',
+    'field' => TRUE,
+    'module' => 'node_reference',
+  );
+
+  $info['types']['node-reference-field-value'] = array(
+    'name' => t('Node reference field values'),
+    'description' => t('Tokens related to node reference field values.'),
+    'needs-data' => 'node-reference-field-value',
+    'field-value' => TRUE,
+    'module' => 'node_reference',
+  );
+
+  $info['tokens']['node-reference-field-value']['nid'] = array(
+    'name' => t('Node'),
+    'description' => t('The field node.'),
+    'type' => 'node',
+  );
+
+  return $info;
+}
+