diff --git a/drupalorg/drupalorg.module b/drupalorg/drupalorg.module
index c7f0a60..05315ed 100755
--- a/drupalorg/drupalorg.module
+++ b/drupalorg/drupalorg.module
@@ -342,7 +342,7 @@ function drupalorg_block_view($delta, $block = NULL) {
             break;
 
           case 'user/%/track':
-            if ($item['map'][1]->uid === $user->uid) {
+            if ($item['map'][1] === $user->uid) {
               $blocks[] = array('Your Posts', 'drupalorg', 'tracker_user');
             }
             break;
diff --git a/features/drupalorg_user_tracker/drupalorg_user_tracker.features.inc b/features/drupalorg_user_tracker/drupalorg_user_tracker.features.inc
new file mode 100644
index 0000000..44493a6
--- /dev/null
+++ b/features/drupalorg_user_tracker/drupalorg_user_tracker.features.inc
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @file
+ * drupalorg_user_tracker.features.inc
+ */
+
+/**
+ * Implements hook_views_api().
+ */
+function drupalorg_user_tracker_views_api() {
+  return array("version" => "3.0");
+}
diff --git a/features/drupalorg_user_tracker/drupalorg_user_tracker.info b/features/drupalorg_user_tracker/drupalorg_user_tracker.info
new file mode 100644
index 0000000..1991896
--- /dev/null
+++ b/features/drupalorg_user_tracker/drupalorg_user_tracker.info
@@ -0,0 +1,11 @@
+name = Drupal.org User Tracker
+description = Overrides user tracker listings with a view
+core = 7.x
+package = Features
+version = 7.x-3.0-alpha2
+project = drupalorg_user_tracker
+dependencies[] = ctools
+dependencies[] = views
+features[ctools][] = views:views_default:3.0
+features[features_api][] = api:1
+features[views_view][] = drupalorg_user_tracker
diff --git a/features/drupalorg_user_tracker/drupalorg_user_tracker.module b/features/drupalorg_user_tracker/drupalorg_user_tracker.module
new file mode 100644
index 0000000..645d814
--- /dev/null
+++ b/features/drupalorg_user_tracker/drupalorg_user_tracker.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the Drupal.org User Tracker feature.
+ */
+
+include_once 'drupalorg_user_tracker.features.inc';
diff --git a/features/drupalorg_user_tracker/drupalorg_user_tracker.views_default.inc b/features/drupalorg_user_tracker/drupalorg_user_tracker.views_default.inc
new file mode 100644
index 0000000..64fb960
--- /dev/null
+++ b/features/drupalorg_user_tracker/drupalorg_user_tracker.views_default.inc
@@ -0,0 +1,215 @@
+<?php
+/**
+ * @file
+ * drupalorg_user_tracker.views_default.inc
+ */
+
+/**
+ * Implements hook_views_default_views().
+ */
+function drupalorg_user_tracker_views_default_views() {
+  $export = array();
+
+  $view = new view();
+  $view->name = 'drupalorg_user_tracker';
+  $view->description = 'Shows all new activity on system.';
+  $view->tag = 'default';
+  $view->base_table = 'node';
+  $view->human_name = 'Drupal.org User Tracker';
+  $view->core = 0;
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Master */
+  $handler = $view->new_display('default', 'Master', 'default');
+  $handler->display->display_options['title'] = 'Recent posts';
+  $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'role';
+  $handler->display->display_options['access']['role'] = array(
+    2 => '2',
+  );
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['query']['options']['query_comment'] = FALSE;
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '25';
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'type' => 'type',
+    'title' => 'title',
+    'name' => 'name',
+    'comment_count' => 'comment_count',
+    'last_comment_timestamp' => 'last_comment_timestamp',
+    'timestamp' => 'title',
+    'new_comments' => 'comment_count',
+    'last_updated' => 'last_updated',
+  );
+  $handler->display->display_options['style_options']['default'] = '-1';
+  $handler->display->display_options['style_options']['info'] = array(
+    'type' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'title' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '&nbsp;',
+      'empty_column' => 0,
+    ),
+    'name' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'comment_count' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '<br />',
+      'empty_column' => 0,
+    ),
+    'last_comment_timestamp' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '&nbsp;',
+      'empty_column' => 0,
+    ),
+    'timestamp' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'new_comments' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'last_updated' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+  );
+  /* Relationship: Content: Author */
+  $handler->display->display_options['relationships']['uid']['id'] = 'uid';
+  $handler->display->display_options['relationships']['uid']['table'] = 'node';
+  $handler->display->display_options['relationships']['uid']['field'] = 'uid';
+  /* Field: Content: Type */
+  $handler->display->display_options['fields']['type']['id'] = 'type';
+  $handler->display->display_options['fields']['type']['table'] = 'node';
+  $handler->display->display_options['fields']['type']['field'] = 'type';
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  /* Field: User: Name */
+  $handler->display->display_options['fields']['name']['id'] = 'name';
+  $handler->display->display_options['fields']['name']['table'] = 'users';
+  $handler->display->display_options['fields']['name']['field'] = 'name';
+  $handler->display->display_options['fields']['name']['relationship'] = 'uid';
+  $handler->display->display_options['fields']['name']['label'] = 'Author';
+  /* Field: Content: Comment count */
+  $handler->display->display_options['fields']['comment_count']['id'] = 'comment_count';
+  $handler->display->display_options['fields']['comment_count']['table'] = 'node_comment_statistics';
+  $handler->display->display_options['fields']['comment_count']['field'] = 'comment_count';
+  $handler->display->display_options['fields']['comment_count']['label'] = 'Replies';
+  /* Field: Content: Updated/commented date */
+  $handler->display->display_options['fields']['last_updated']['id'] = 'last_updated';
+  $handler->display->display_options['fields']['last_updated']['table'] = 'node_comment_statistics';
+  $handler->display->display_options['fields']['last_updated']['field'] = 'last_updated';
+  $handler->display->display_options['fields']['last_updated']['label'] = 'Last Post';
+  $handler->display->display_options['fields']['last_updated']['date_format'] = 'time ago';
+  /* Field: Content: Has new content */
+  $handler->display->display_options['fields']['timestamp']['id'] = 'timestamp';
+  $handler->display->display_options['fields']['timestamp']['table'] = 'history';
+  $handler->display->display_options['fields']['timestamp']['field'] = 'timestamp';
+  $handler->display->display_options['fields']['timestamp']['label'] = '';
+  $handler->display->display_options['fields']['timestamp']['comments'] = TRUE;
+  /* Field: Content: New comments */
+  $handler->display->display_options['fields']['new_comments']['id'] = 'new_comments';
+  $handler->display->display_options['fields']['new_comments']['table'] = 'node';
+  $handler->display->display_options['fields']['new_comments']['field'] = 'new_comments';
+  $handler->display->display_options['fields']['new_comments']['label'] = '';
+  $handler->display->display_options['fields']['new_comments']['hide_empty'] = TRUE;
+  $handler->display->display_options['fields']['new_comments']['suffix'] = ' new';
+  /* Sort criterion: Content: Updated/commented date */
+  $handler->display->display_options['sorts']['last_updated']['id'] = 'last_updated';
+  $handler->display->display_options['sorts']['last_updated']['table'] = 'node_comment_statistics';
+  $handler->display->display_options['sorts']['last_updated']['field'] = 'last_updated';
+  $handler->display->display_options['sorts']['last_updated']['order'] = 'DESC';
+  /* Contextual filter: Content: User posted or commented */
+  $handler->display->display_options['arguments']['uid_touch']['id'] = 'uid_touch';
+  $handler->display->display_options['arguments']['uid_touch']['table'] = 'node';
+  $handler->display->display_options['arguments']['uid_touch']['field'] = 'uid_touch';
+  $handler->display->display_options['arguments']['uid_touch']['exception']['title_enable'] = TRUE;
+  $handler->display->display_options['arguments']['uid_touch']['title_enable'] = TRUE;
+  $handler->display->display_options['arguments']['uid_touch']['title'] = 'Recent posts for %1';
+  $handler->display->display_options['arguments']['uid_touch']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['uid_touch']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['uid_touch']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['uid_touch']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['uid_touch']['specify_validation'] = TRUE;
+  /* Filter criterion: Content: Published */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = '1';
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['path'] = 'tracker/%';
+  $handler->display->display_options['menu']['title'] = 'All Recent Content';
+  $handler->display->display_options['menu']['weight'] = '0';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+  $handler->display->display_options['tab_options']['title'] = 'Recent content';
+  $handler->display->display_options['tab_options']['weight'] = '0';
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['defaults']['arguments'] = FALSE;
+  /* Contextual filter: Content: User posted or commented */
+  $handler->display->display_options['arguments']['uid_touch']['id'] = 'uid_touch';
+  $handler->display->display_options['arguments']['uid_touch']['table'] = 'node';
+  $handler->display->display_options['arguments']['uid_touch']['field'] = 'uid_touch';
+  $handler->display->display_options['arguments']['uid_touch']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['uid_touch']['exception']['title_enable'] = TRUE;
+  $handler->display->display_options['arguments']['uid_touch']['title_enable'] = TRUE;
+  $handler->display->display_options['arguments']['uid_touch']['title'] = '%1';
+  $handler->display->display_options['arguments']['uid_touch']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['uid_touch']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['uid_touch']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['uid_touch']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['uid_touch']['specify_validation'] = TRUE;
+  $handler->display->display_options['path'] = 'user/%/track';
+  $handler->display->display_options['menu']['title'] = 'My recent content';
+  $handler->display->display_options['menu']['weight'] = '0';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page_2');
+  $handler->display->display_options['path'] = 'tracker';
+  $handler->display->display_options['menu']['title'] = 'All Recent Content';
+  $handler->display->display_options['menu']['weight'] = '0';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+  $handler->display->display_options['tab_options']['title'] = 'Recent content';
+  $handler->display->display_options['tab_options']['weight'] = '0';
+  $export['drupalorg_user_tracker'] = $view;
+
+  return $export;
+}