diff --git a/asin/asin.module b/asin/asin.module
index e45ec21..8dc77ab 100644
--- a/asin/asin.module
+++ b/asin/asin.module
@@ -594,3 +594,61 @@ function asin_devel_generate_set_values($form, &$form_state) {
   variable_set('asin_devel_generate_keywords', $form_state['values']['asin_devel_generate_keywords']);
   variable_set('asin_devel_generate_search_index', $form_state['values']['asin_devel_generate_search_index']);
 }
+
+
+/**
+ * Implementation of hook_token_list()
+ */
+function asin_token_list($type = 'all') {
+  if ($type == 'field' || $type == 'all') {
+    $tokens = array();
+    $tokens['asin']['asin'] = t("Product ID");
+    $tokens['asin']['title'] = t("Title retrieved from Amazon.com");
+    $tokens['asin']['isbn'] = t("The 10-digit ISBN (INternational Standard Book Number)");
+    $tokens['asin']['ean'] = t("The EAN or 13-digit ISBN");
+    $tokens['asin']['detailpageurl'] = t("The detail page URL for the item");
+    $tokens['asin']['salesrank'] = t("The product's sales rank");
+    $tokens['asin']['brand'] = t("The product's brand");
+    $tokens['asin']['publisher'] = t("The product's publisher");
+    $tokens['asin']['manufacturer'] = t("The product's manufacturer");
+    $tokens['asin']['studio'] = t("The product's studio");
+    $tokens['asin']['label'] = t("The product's label");
+    $tokens['asin']['binding'] = t("The product's binding type");
+    $tokens['asin']['releasedate'] = t("The product's release date");
+    $tokens['asin']['listprice'] = t("The product's list price");
+    $tokens['asin']['producttype'] = t("The product's Amazon product type");
+    $tokens['asin']['lowestprice'] = t("The lowest price currently offered by any merchant at Amazon");
+    $tokens['asin']['amazonprice'] = t("Current price offered by Amazon");
+  }
+}
+
+/**
+ * Implementation of hook_token_values()
+ */
+function asin_token_values($type, $object = NULL, $options = array()) {
+  if ($type == 'field') {
+    $item = $object[0];
+    $asin = amazon_convert_to_asin($item['asin']);
+    $amazonArr = amazon_item_lookup($asin);
+    $item = $amazonArr[$asin];
+    $values['asin'] = check_plain($item['asin']);
+    $values['title'] = check_plain($item['title']);
+    $values['isbn'] = check_plain($item['isbn']);
+    $values['ean'] = check_plain($item['ean']);
+    $values['detailpageurl'] = check_url($item['detailpageurl']);
+    $values['salesrank'] = check_plain($item['salesrank']);
+    $values['brand'] = check_plain($item['brand']);
+    $values['publisher'] = check_plain($item['publisher']);
+    $values['manufacturer'] = check_plain($item['manufacturer']);
+    $values['studio'] = check_plain($item['studio']);
+    $values['label'] = check_plain($item['label']);
+    $values['binding'] = check_plain($item['binding']);
+    $values['releasedate'] = check_plain($item['releasedate']);
+    $values['listprice'] = check_plain($item['listpriceformattedprice']);
+    $values['producttype'] = check_plain($item['producttype']);
+    $values['lowestprice'] = check_plain($item['lowestpriceformattedprice']);
+    $values['amazonprice'] = check_plain($item['amazonpriceformattedprice']);
+    return $values;
+  }
+}
+