diff --git a/modules/node/views_handler_field_node_path.inc b/modules/node/views_handler_field_node_path.inc
index f47f85f..5ad3600 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['node_language'] = array('default' => FALSE, 'bool' => TRUE);
 
     return $options;
   }
@@ -33,6 +34,13 @@ class views_handler_field_node_path extends views_handler_field {
       '#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['node_language'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use node language as language URL'),
+      '#default_value' => $this->options['node_language'],
+      '#description' => t('Enable this option to output the URL in the node\'s language.'),
+      '#fieldset' => 'alter',
+    );
   }
 
   function query() {
@@ -42,6 +50,12 @@ 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']));
+    $options = array('absolute' => $this->options['absolute']);
+    if ($this->options['node_language']) {
+      $node = node_load($nid);
+      $languages = language_list();
+      $options['language'] = $languages[$node->language];
+    }
+    return url("node/$nid", $options);
   }
 }