diff --git a/token_node.inc b/token_node.inc
index 2e56d6c..63f361f 100644
--- a/token_node.inc
+++ b/token_node.inc
@@ -34,6 +34,10 @@ function node_token_values($type, $object = NULL, $options = array()) {
     $values['language']           = check_plain($node->language);
     $values['title']              = check_plain($node->title);
     $values['title-raw']          = $node->title;
+    $values['body']               = check_markup($node->body);
+    $values['body-raw']           = $node->body;
+    $values['teaser']             = check_markup($node->teaser);
+    $values['teaser-raw']         = $node->teaser;
     $values['node-path-raw']      = drupal_get_path_alias('node/'. $node->nid);
     $values['node-path']          = check_plain($values['node-path-raw']);
     $values['node-url']           = url('node/' . $node->nid, array('absolute' => TRUE));
@@ -141,6 +145,10 @@ function node_token_list($type = 'all') {
     $tokens['node']['language']        = t('The language the node is written in.');
     $tokens['node']['title']           = t('The title of the node.');
     $tokens['node']['title-raw']       = t('The title of the node.');
+    $tokens['node']['body']            = t('The body of the node.');
+    $tokens['node']['body-raw']        = t('The body of the node.');
+    $tokens['node']['teaser']          = t('The teaser of the node.');
+    $tokens['node']['teaser-raw']      = t('The teaser of the node.');
     $tokens['node']['node-path']       = t('The URL alias of the node.');
     $tokens['node']['node-path-raw']   = t('The URL alias of the node.');
     $tokens['node']['node-url']        = t('The URL of the node.');