diff --git a/page_manager/plugins/tasks/node_revision_view.inc b/page_manager/plugins/tasks/node_revision_view.inc
new file mode 100644
index 0000000..d85312d
--- /dev/null
+++ b/page_manager/plugins/tasks/node_revision_view.inc
@@ -0,0 +1,164 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Handle the 'node revision view' override task.
+ *
+ * This plugin overrides node/%node/revisions/%vid/view and reroutes it to the 
+ * page manager, where a list of tasks can be used to service this request 
+ * based upon criteria supplied by access plugins.
+ */
+
+/**
+ * Specialized implementation of hook_page_manager_task_tasks(). See api-task.html for
+ * more information.
+ */
+function page_manager_node_revision_view_page_manager_tasks() {
+  return array(
+    // This is a 'page' task and will fall under the page admin UI
+    'task type' => 'page',
+    'title' => t('Node revision template'),
+    'description' => t('The node revision view task allows you to control what handler will handle the job of rendering a node view at the path <em>node/%node/revisions/%vid/view</em>. If no handler is set or matches the criteria, the default Drupal node renderer will be used.'),
+    'admin title' => 'Node revision view', // translated by menu system
+    'admin description' => 'Overrides for the node revision view handler at <em>node/%node/revisions/%vid/view</em>.',
+    'admin path' => 'node/%node/revisions/%vid/view',
+    'hook menu alter' => 'page_manager_node_revision_view_menu_alter',
+
+    // This task uses 'context' handlers and must implement these to give the
+    // handler data it needs.
+    'handler type' => 'context',
+    'get arguments' => 'page_manager_node_revision_view_get_arguments',
+    'get context placeholders' => 'page_manager_node_revision_view_get_contexts',
+    
+    // Allow this to be enabled or disabled:
+    'disabled' => variable_get('page_manager_node_revision_view_disabled', FALSE),
+    'enable callback' => 'page_manager_node_revision_view_enable',
+  );
+}
+
+/**
+ * Callback defined by page_manager_node_view_page_manager_tasks().
+ *
+ * Alter the node view input so that node view comes to us rather than the
+ * normal node view process.
+ */
+function page_manager_node_revision_view_menu_alter(&$items, $task) {
+  if (variable_get('page_manager_node_revision_view_disabled', TRUE)) {
+    return;
+  }
+  // Override the node view handler for our purpose.
+  $callback = $items['node/%node/revisions/%/view']['page callback'];
+  if ($callback == 'node_show' || variable_get('page_manager_override_anyway', FALSE)) {
+    //TODO: make node overriding optional, so that nodes can vary from revision layouts if needed.
+    // our use case has always been that revisions and published nodes are identical, but that may not always be the case.
+    // need a variable on the page settings that allows us to override normal node rendering with this page.
+    // then menu cache will need clearing if that value has changed.
+    $items['node/%node/view']['page callback'] = 'page_manager_node_revision_view_page';
+    $items['node/%node/view']['file path'] = $task['path'];
+    $items['node/%node/view']['file'] = $task['file'];
+
+    $items['node/%node']['page callback'] = 'page_manager_node_revision_view_page';
+    $items['node/%node']['file path'] = $task['path'];
+    $items['node/%node']['file'] = $task['file'];
+
+    $items['node/%node/revisions/%/view']['page callback'] = 'page_manager_node_revision_view_page';
+    $items['node/%node/revisions/%/view']['file path'] = $task['path'];
+    $items['node/%node/revisions/%/view']['file'] = $task['file'];
+
+  }else {
+    // automatically disable this task if it cannot be enabled.
+    variable_set('page_manager_node_revision_view_disabled', TRUE);
+    if (!empty($GLOBALS['page_manager_enabling_node_revision_view'])) {
+      drupal_set_message(t('Revisioning module is unable to override node/%node/revisions/%/view because some other module already has overridden with %callback.', array('%callback' => $callback)), 'error');
+    }
+  }
+}
+
+/**
+ * Entry point for our overridden node view.
+ *
+ * This function asks its assigned handlers who, if anyone, would like
+ * to run with it. If no one does, it passes through to Drupal core's
+ * node view, which is node_page_view().
+ */
+function page_manager_node_revision_view_page($node) {
+  // Load my task plugin
+  $task = page_manager_get_task('node_revision_view');
+
+  // Load the node into a context.
+  ctools_include('context');
+  ctools_include('context-task-handler');
+  $contexts = ctools_context_handler_get_task_contexts($task, '', array($node));
+  $output = ctools_context_handler_render($task, '', $contexts, array($node->nid));
+  if ($output !== FALSE) {
+    node_tag_new($node);
+    return $output;
+  }
+
+  //$function = 'node_page_view';
+  $function = '_page_manager_view_revision';
+  foreach (module_implements('page_manager_override') as $module) {
+    $call = $module . '_page_manager_override';
+    if (($rc = $call('node_revision_view')) && function_exists($rc)) {
+      $function = $rc;
+      break;
+    }
+  }
+
+  // Otherwise, fall back.
+  return $function($node);
+}
+
+ /**
+  * _page_manager_view_revision
+  */
+function _page_manager_view_revision($node) {
+  drupal_set_title($node->title);
+  $uri = entity_uri('node', $node);
+  // Set the node path as the canonical URL to prevent duplicate content.
+  drupal_add_html_head_link(array('rel' => 'canonical', 'href' => url($uri['path'], $uri['options'])), TRUE);
+  // Set the non-aliased path as a default shortlink.
+  drupal_add_html_head_link(array('rel' => 'shortlink', 'href' => url($uri['path'], array_merge($uri['options'], array('alias' => TRUE)))), TRUE);
+  return node_view($node);
+}
+ 
+/**
+ * Callback to get arguments provided by this task handler.
+ *
+ * Since this is the node view and there is no UI on the arguments, we
+ * create dummy arguments that contain the needed data.
+ */ 
+function page_manager_node_revision_view_get_arguments($task, $subtask_id) {
+  return array(
+    array(
+      'keyword' => 'node',
+      'identifier' => t('Node revision being viewed'),
+      'id' => 1,
+      'name' => 'entity_id:node',
+      'settings' => array(),
+    ),
+  );
+}
+
+/**
+ * Callback to get context placeholders provided by this handler.
+ */
+function page_manager_node_revision_view_get_contexts($task, $subtask_id) {
+  return ctools_context_get_placeholders_from_argument(page_manager_node_revision_view_get_arguments($task, $subtask_id));
+}
+
+/**
+ * Callback to enable/disable the page from the UI.
+ */
+function page_manager_node_revision_view_enable($cache, $status) {
+  variable_set('page_manager_node_revision_view_disabled', $status);
+
+  // Set a global flag so that the menu routine knows it needs
+  // to set a message if enabling cannot be done.
+  
+  if (!$status) {
+    $GLOBALS['page_manager_enabling_node_revision_view'] = TRUE;
+  }
+  
+}