diff --git sites/all/modules/tracker2/tracker2.admin.inc sites/all/modules/tracker2/tracker2.admin.inc
index f03689d..450eb4a 100644
--- sites/all/modules/tracker2/tracker2.admin.inc
+++ sites/all/modules/tracker2/tracker2.admin.inc
@@ -34,6 +34,21 @@ function tracker2_admin() {
     '#default_value' => variable_get('tracker2_pager', 25),
     '#required' => TRUE,
   );
+  
+  if (module_exists('flag')) {
+    $flags = flag_get_flags();
+    $flag_options[] = t('None');
+    foreach ($flags as $flag) {
+      $flag_options[$flag->name] = $flag->title;
+    }
+    $form['tracker2_subscription_flag'] = array(
+      '#title' => t('Subscription Flag'),
+      '#description' => t('If you allow users to subscribe to content on your site with Flag, choose that particular flag here.'),
+      '#type' => 'select',
+      '#options' => $flag_options,
+      '#default_value' => variable_get('tracker2_subscription_flag', NULL),
+    );
+  }
 
   return system_settings_form($form);
 }
diff --git sites/all/modules/tracker2/tracker2.pages.inc sites/all/modules/tracker2/tracker2.pages.inc
index 2a8d6e4..ca6f67d 100644
--- sites/all/modules/tracker2/tracker2.pages.inc
+++ sites/all/modules/tracker2/tracker2.pages.inc
@@ -67,13 +67,18 @@ function theme_tracker2_page($nodes = array()) {
         }
       }
 
-      $rows[] = array(
+      $rows[$node->nid] = array(
         check_plain(node_get_types('name', $node->type)),
         l($node->title, "node/$node->nid") .' '. theme('mark', node_mark($node->nid, $node->changed)),
         theme('username', $node),
         array('class' => 'replies', 'data' => $comments),
         t('!time ago', array('!time' => format_interval(time() - $node->last_activity)))
       );
+
+      // Deal with subscription flag
+      if ($flag_name = variable_get('tracker2_subscription_flag', FALSE)) {
+        array_unshift($rows[$node->nid], flag_create_link($flag_name, $node->nid));
+      }
     }
   }
   else {
@@ -81,6 +86,9 @@ function theme_tracker2_page($nodes = array()) {
   }
 
   $header = array(t('Type'), t('Post'), t('Author'), t('Replies'), t('Last updated'));
+  if ($flag_name) {
+    array_unshift($header, t('Subscription'));
+  }
 
   $output = '<div id="tracker">';
   $output .= theme('table', $header, $rows);