diff --git a/modules/node/views_handler_field_node_path.inc b/modules/node/views_handler_field_node_path.inc
index f47f85f..c5b80a2 100644
--- a/modules/node/views_handler_field_node_path.inc
+++ b/modules/node/views_handler_field_node_path.inc
@@ -15,6 +15,7 @@ class views_handler_field_node_path extends views_handler_field {
   function option_definition() {
     $options = parent::option_definition();
     $options['absolute'] = array('default' => FALSE, 'bool' => TRUE);
+    $options['strip_base_path'] = array('default' => FALSE, 'bool' => TRUE);
 
     return $options;
   }
@@ -31,7 +32,13 @@ class views_handler_field_node_path extends views_handler_field {
       '#title' => t('Use absolute link (begins with "http://")'),
       '#default_value' => $this->options['absolute'],
       '#description' => t('Enable this option to output an absolute link. Required if you want to use the path as a link destination (as in "output this field as a link" above).'),
-      '#fieldset' => 'alter',
+    );
+    $form['strip_base_path'] = array(
+      '#type' => 'checkbox',
+      '#title' => t("Don't include the base-path to path."),
+      '#default_value' => $this->options['strip_base_path'],
+      '#description' => t('It might be helpful to strip the base-path from the url, for example when using it in tokens'),
+      '#dependency' => array('edit-options-absolute' => array(0)),
     );
   }
 
@@ -42,6 +49,18 @@ class views_handler_field_node_path extends views_handler_field {
 
   function render($values) {
     $nid = $this->get_value($values, 'nid');
-    return url("node/$nid", array('absolute' => $this->options['absolute']));
+
+    if ($this->options['absolute']) {
+      $url = url("node/$nid", array('absolute' => $this->options['absolute']));
+    }
+    elseif ($this->options['strip_base_path']) {
+      $url = url("node/$nid");
+      $url = drupal_substr($url, strlen(base_path()));
+    }
+    else {
+      $url = url("node/$nid");
+    }
+
+    return $url;
   }
 }
diff --git a/tests/node/views_handler_field_node_path.test b/tests/node/views_handler_field_node_path.test
new file mode 100644
index 0000000..ea2e158
--- /dev/null
+++ b/tests/node/views_handler_field_node_path.test
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * @file
+ * Definition of ViewsHandlerAreaTextTest.
+ */
+
+/**
+ * Tests the text area handler.
+ *
+ * @see views_handler_field_node_path
+ */
+class ViewsHandlerFieldNodePathTest extends ViewsSqlTest {
+  public $nodes = array();
+  public $paths = array();
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Tests handler field_node_path',
+      'description' => 'Tests the node path field handler',
+      'group' => 'Views Modules',
+    );
+  }
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a node with a path alias.
+    $path_alias = $this->randomName();
+    $this->nodes[] = $this->drupalCreateNode(array('path' => array('alias' => $path_alias)));
+    $this->paths[] = $path_alias;
+
+    // Create a node without a path alias.
+    $this->nodes[] = $node = $this->drupalCreateNode();
+    $this->paths[] = "node/$node->nid";
+  }
+
+
+  function testNodePath() {
+    $view = $this->viewNodePath();
+    $this->executeView($view);
+
+    $view->field['path']->options['absolute'] = FALSE;
+    foreach ($this->nodes as $key => $node) {
+      $path = $view->field['path']->advanced_render($view->result[$key]);
+      $this->assertEqual(base_path() . $this->paths[$key], $path, 'Take sure that not absolute path uses the expected path');
+    }
+
+    $view->field['path']->options['absolute'] = TRUE;
+    foreach ($this->nodes as $key => $node) {
+      $path = $view->field['path']->advanced_render($view->result[$key]);
+      $this->assertEqual($GLOBALS['base_url'] . '/' . $this->paths[$key], $path, 'Take sure that absolute path uses the expected path');
+    }
+
+    $view->field['path']->options['absolute'] = FALSE;
+    $view->field['path']->options['strip_base_path'] = TRUE;
+    foreach ($this->nodes as $key => $node) {
+      $path = $view->field['path']->advanced_render($view->result[$key]);
+      $this->assertEqual($this->paths[$key], $path, 'Take sure that not absolute path without base_path() uses the expected path');
+    }
+  }
+
+  function viewNodePath() {
+    $view = new view;
+    $view->name = 'test_node_path';
+    $view->description = '';
+    $view->tag = 'default';
+    $view->base_table = 'node';
+    $view->human_name = 'test_node_path';
+    $view->core = 7;
+    $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['access']['type'] = 'perm';
+    $handler->display->display_options['cache']['type'] = 'none';
+    $handler->display->display_options['query']['type'] = 'views_query';
+    $handler->display->display_options['exposed_form']['type'] = 'basic';
+    $handler->display->display_options['pager']['type'] = 'full';
+    $handler->display->display_options['style_plugin'] = 'default';
+    $handler->display->display_options['row_plugin'] = 'fields';
+    /* Field: Content: Path */
+    $handler->display->display_options['fields']['path']['id'] = 'path';
+    $handler->display->display_options['fields']['path']['table'] = 'node';
+    $handler->display->display_options['fields']['path']['field'] = 'path';
+    $handler->display->display_options['fields']['path']['label'] = '';
+    $handler->display->display_options['fields']['path']['element_label_colon'] = FALSE;
+    /* Sort criterion: Content: Nid */
+    $handler->display->display_options['sorts']['nid']['id'] = 'nid';
+    $handler->display->display_options['sorts']['nid']['table'] = 'node';
+    $handler->display->display_options['sorts']['nid']['field'] = 'nid';
+
+    return $view;
+  }
+}
diff --git a/views.info b/views.info
index aeb692b..ffcfebb 100644
--- a/views.info
+++ b/views.info
@@ -289,6 +289,7 @@ files[] = tests/views_upgrade.test
 files[] = tests/views_test.views_default.inc
 files[] = tests/comment/views_handler_argument_comment_user_uid.test
 files[] = tests/comment/views_handler_filter_comment_user_uid.test
+files[] = tests/node/views_handler_field_node_path.test
 files[] = tests/user/views_handler_field_user_name.test
 files[] = tests/user/views_user_argument_default.test
 files[] = tests/user/views_user_argument_validate.test