diff --git scheduler.module scheduler.module
index 29b2366..74e80ba 100644
--- scheduler.module
+++ scheduler.module
@@ -584,3 +584,35 @@ function scheduler_content_extra_fields($type_name) {
 
   return $fields;
 }
+
+/**
+ * Implementation of hook_token_values().
+ */
+function scheduler_token_values($type, $object = NULL, $options = array()) {
+  if ($type == 'node') {
+    $node = $object;
+    if (isset($node->publish_on)) {
+      $tokens['node']['publish_on-raw']   = $node->publish_on;
+      $tokens += token_get_date_token_values($node->publish_on);
+    }
+    
+    if (isset($node->unpublish_on)) {
+      $tokens['node']['unpublish_on-raw'] = $node->unpublish_on;
+      $tokens += token_get_date_token_values($node->unpublish_on);
+    }
+    return $tokens;
+  }
+}
+
+/**
+ * Implementation of hook_token_list().
+ */
+function scheduler_token_list($type = 'all') {
+  if ($type == 'node' || $type == 'all') {
+    $tokens['node']['publish_on-raw']   = t('Publish on date');
+    $tokens['node'] += token_get_date_token_info(t('Publish on'), 'pub-');
+    $tokens['node']['unpublish_on-raw'] = t('Unpublish on date');
+    $tokens['node'] += token_get_date_token_info(t('Unpublish on'), 'unpub-');
+    return $tokens;
+  }
+}
\ No newline at end of file