diff --git a/includes/flag.token.inc b/includes/flag.token.inc
index 7bdb52e..a08f1f8 100644
--- a/includes/flag.token.inc
+++ b/includes/flag.token.inc
@@ -27,6 +27,7 @@ function flag_token_list($type = 'all') {
       $flags = flag_get_flags($flag_type);
       foreach ($flags as $flag) {
         $tokens[$flag_type]['flag-'. str_replace('_', '-', $flag->name) .'-count'] = t('Total flag count for flag @flag', array('@flag' => $flag->get_title()));
+        $tokens[$flag_type]['flag-'. str_replace('_', '-', $flag->name) .'-link'] = t('Flag/unflag link for @flag', array('@flag' => $flag->get_title()));
       }
     }
   }
@@ -54,6 +55,7 @@ function flag_token_values($type, $object = NULL) {
     $flags = flag_get_flags($type);
     foreach ($flags as $flag) {
       $values['flag-'. str_replace('_', '-', $flag->name) .'-count'] = $flag->get_count($flag->get_content_id($object));
+      $values['flag-'. str_replace('_', '-', $flag->name) .'-link'] = flag_create_link($flag->name, $flag->get_content_id($object));
     }
   }
   return $values;