diff --git a/6.x/token/token.module b/6.x/token/token.module
index 8bef2ce..4125329 100644
--- a/6.x/token/token.module
+++ b/6.x/token/token.module
@@ -396,6 +396,14 @@ function token_get_date_token_info($description, $token_prefix = '') {
   $tokens[$token_prefix . 'ddd']    = t("!description day (abbreviation)", array('!description' => $description));
   $tokens[$token_prefix . 'dd']     = t("!description day (two digits with leading zeros)", array('!description' => $description));
   $tokens[$token_prefix . 'd']      = t("!description day (one or two digits without leading zeros)", array('!description' => $description));
+  $tokens[$token_prefix . 'a']      = t("!description am/pm (lowercase)", array('!description' => $description));
+  $tokens[$token_prefix . 'A']      = t("!description AM/PM (uppercase)", array('!description' => $description));
+  $tokens[$token_prefix . 'h']      = t("!description hour (12-hour format, without leading zeros)", array('!description' => $description));
+  $tokens[$token_prefix . 'hh']     = t("!description hour (24-hour format, without leading zeros)", array('!description' => $description));
+  $tokens[$token_prefix . 'H']      = t("!description hour (12-hour format, with leading zeros)", array('!description' => $description));
+  $tokens[$token_prefix . 'HH']     = t("!description hour (24-hour format, with leading zeros)", array('!description' => $description));
+  $tokens[$token_prefix . 'mn']     = t("!description minute (with leading zeros)", array('!description' => $description));
+  $tokens[$token_prefix . 's']      = t("!description second (with leading zeros)", array('!description' => $description));
   $tokens[$token_prefix . 'raw']    = t("!description in UNIX timestamp format (1269441371)", array('!description' => $description));
   return $tokens;
 }
@@ -422,6 +430,14 @@ function token_get_date_token_values($timestamp, $token_prefix = '') {
     'ddd' => 'D',
     'dd' => 'd',
     'd' => 'j',
+    'a' => 'a',
+    'A' => 'A',
+    'h' => 'g',
+    'hh' => 'G',
+    'H' => 'h',
+    'HH' => 'H',
+    'mn' => 'i',
+    's' => 's',
   );
   foreach ($formats as $token => $format) {
     $tokens[$token_prefix . $token] = format_date($timestamp, 'custom', $format, $timezone);
diff --git a/6.x/token/token.test b/6.x/token/token.test
index 8d6d732..bcf21d0 100644
--- a/6.x/token/token.test
+++ b/6.x/token/token.test
@@ -40,8 +40,8 @@ class TokenNodeTestCase extends TokenTestHelper {
   }
 
   function testNodeTokens() {
-    $created = gmmktime(0, 0, 0, 11, 19, 1978);
-    $changed = gmmktime(0, 0, 0, 7, 4, 1984);
+    $created = gmmktime(1, 2, 8, 11, 19, 1978);
+    $changed = gmmktime(2, 2, 9, 7, 4, 1984);
     $node = $this->drupalCreateNode(array(
       'type' => 'page',
       'language' => 'und',
@@ -66,7 +66,15 @@ class TokenNodeTestCase extends TokenTestHelper {
       'ddd' => 'Sun',
       'dd' => '19',
       'd' => '19',
-      'raw' => 280281600,
+      'a' => 'am',
+      'A' => 'AM',
+      'h' => '1',
+      'hh' => '1',
+      'H' => '01',
+      'HH' => '01',
+      'mn' => '02',
+      's' => '08',
+      'raw' => 280285328,
       'mod-yyyy' => '1984',
       'mod-yy' => '84',
       'mod-month' => 'July',
@@ -79,7 +87,15 @@ class TokenNodeTestCase extends TokenTestHelper {
       'mod-ddd' => 'Wed',
       'mod-dd' => '04',
       'mod-d' => '4',
-      'mod-raw' => 457747200,
+      'mod-a' => 'am',
+      'mod-A' => 'AM',
+      'mod-h' => '2',
+      'mod-hh' => '2',
+      'mod-H' => '02',
+      'mod-HH' => '02',
+      'mod-mn' => '02',
+      'mod-s' => '09',
+      'mod-raw' => 457754529,
     );
     $this->assertTokens('node', $node, $tokens);
   }
@@ -124,7 +140,7 @@ class TokenCommentTestCase extends TokenTestHelper {
 
   function testCommentTokens() {
     $comment = $this->createComment(array(
-      'timestamp' => gmmktime(0, 0, 0, 7, 4, 1984),
+      'timestamp' => gmmktime(2, 2, 9, 7, 4, 1984),
     ));
 
     $tokens = array(
@@ -142,10 +158,17 @@ class TokenCommentTestCase extends TokenTestHelper {
       'comment-ddd' => 'Wed',
       'comment-dd' => '04',
       'comment-d' => '4',
-      'comment-raw' => '457747200',
+      'comment-a' => 'am',
+      'comment-A' => 'AM',
+      'comment-h' => '2',
+      'comment-hh' => '2',
+      'comment-H' => '02',
+      'comment-HH' => '02',
+      'comment-mn' => '02',
+      'comment-s' => '09',
+      'comment-raw' => '457754529',
     );
     $this->assertTokens('comment', $comment, $tokens);
-
   }
 }