diff --git a/static/css/clif.css b/static/css/clif.css
index 2833fba..3a4612f 100644
--- a/static/css/clif.css
+++ b/static/css/clif.css
@@ -440,12 +440,6 @@ div.commit {
         padding: .5rem .5rem;
     }
     
-    div.commit details.diff_view .diff .lineno {
-        color: gray;
-        text-align: center;
-        width: 0;
-    }
-    
     div.commit details.diff_view .diff .origin {
         width: 0;
     }
@@ -488,19 +482,27 @@ div.commit {
 .highlight {
     background: none;
 }
-
-    .highlight .linenos {
-        border-right: 1px solid #aaa;
-        padding-right: .5rem;
-    }
-    
-        .highlight .linenos a,
-        .highlight .linenos a:hover,
-        .highlight .linenos a:visited {
-            color: gray;
-            text-decoration: none;
-        }
     
     .highlight .code {
         padding-left: 1rem;
     }
+
+/* Line numbers when showind diffs or blobs.
+ * Do not change class name, because this is an extension of the "lineos" class
+ * that is generated from Pygments. */
+.linenos {
+    border-right: 1px solid #aaa;
+    text-align: right;
+    width: 0;
+}
+
+.linenos a,
+.linenos a:hover,
+.linenos a:visited {
+    color: gray;
+    text-decoration: none;
+}
+
+.linenos a:hover {
+    color: black;
+}
diff --git a/templates/repository/commit.html b/templates/repository/commit.html
index 3e8224e..9cd61dd 100644
--- a/templates/repository/commit.html
+++ b/templates/repository/commit.html
@@ -71,7 +71,9 @@
                 {% for patch in diff %}
                     <tr>
                         <td class="filemode">{{ patch.delta.new_file.mode|filemode }}</td>
-                        <td class="path">{{ patch.delta.new_file.path }}</td>
+                        <td class="path">
+                            <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.id, tree_path=patch.delta.new_file.path) }}">{{ patch.delta.new_file.path }}</a>
+                        </td>
                         <td class="lines">{{ patch.line_stats[1] + patch.line_stats[2] }}</td>
                         <td class="histogram">
                             {% if diff_stats.insertions + diff_stats.deletions > 0 %}
@@ -202,7 +204,7 @@
                     <table>
                         <tr>
                             <td>
-                                index {{ (patch.delta.old_file.id|string)[:7] }}..{{ (patch.delta.new_file.id|string)[:7] }}
+                                index <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.parents[0].id, tree_path=patch.delta.old_file.path) }}">{{ (patch.delta.old_file.id|string)[:7] }}</a>..<a href="{{ url('tree_path', repository=repository[:-4], revision=commit.id, tree_path=patch.delta.new_file.path) }}">{{ (patch.delta.new_file.id|string)[:7] }}</a>
                             </td>
                         </tr>
                         <tr>
@@ -252,14 +254,14 @@
                             
                             {% for line in hunk.lines %}
                                 <tr class="udiff {{ 'insertion' if line.old_lineno < 0 }} {{ 'deletion' if line.new_lineno < 0 }}">
-                                    <td class="lineno">
+                                    <td class="linenos">
                                         {% if line.old_lineno >= 0 %}
-                                            {{ line.old_lineno }}
+                                            <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.parents[0].id, tree_path=patch.delta.old_file.path) }}#line-{{ line.old_lineno }}">{{ line.old_lineno }}</a>
                                         {% endif %}
                                     </td>
-                                    <td class="lineno">
+                                    <td class="linenos">
                                         {% if line.new_lineno >= 0 %}
-                                            {{ line.new_lineno }}
+                                            <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.id, tree_path=patch.delta.new_file.path) }}#line-{{ line.new_lineno }}">{{ line.new_lineno }}</a>
                                         {% endif %}
                                     </td>
                                     <td class="origin">{{ line.origin }}</td>
@@ -282,23 +284,23 @@
                                 {% for buffer_del, buffer_ins in zip_longest(buffer_deletions, buffer_insertions) %}
                                     <tr class="ssdiff">
                                         {% if buffer_del %}
-                                            <td class="lineno">
-                                                {{ buffer_del.old_lineno }}
+                                            <td class="linenos">
+                                                <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.parents[0].id, tree_path=patch.delta.old_file.path) }}#line-{{ buffer_del.old_lineno }}">{{ buffer_del.old_lineno }}</a>
                                             </td>
                                             <td class="content {{ 'deletion' if buffer_insertions|length == 0 else 'change' }}">{{ buffer_del.content }}</td>
                                         {% else %}
-                                            <td class="lineno">
+                                            <td class="linenos">
                                             </td>
                                             <td class="content"></td>
                                         {% endif %}
                                         
                                         {% if buffer_ins %}
-                                            <td class="lineno">
-                                                {{ buffer_ins.new_lineno }}
+                                            <td class="linenos">
+                                                <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.id, tree_path=patch.delta.new_file.path) }}#line-{{ buffer_ins.new_lineno }}">{{ buffer_ins.new_lineno }}</a>
                                             </td>
                                             <td class="content {{ 'insertion' if buffer_deletions|length == 0 else 'change' }}">{{ buffer_ins.content }}</td>
                                         {% else %}
-                                            <td class="lineno">
+                                            <td class="linenos">
                                             </td>
                                             <td class="content"></td>
                                         {% endif %}
@@ -334,13 +336,13 @@
                                     
                                     {# Insert the unchanged line. #}
                                     <tr class="ssdiff">
-                                        <td class="lineno">
-                                            {{ line.old_lineno }}
+                                        <td class="linenos">
+                                            <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.parents[0].id, tree_path=patch.delta.old_file.path) }}#line-{{ line.old_lineno }}">{{ line.old_lineno }}</a>
                                         </td>
                                         <td class="content">{{ line.content }}</td>
                                         
-                                        <td class="lineno">
-                                            {{ line.new_lineno }}
+                                        <td class="linenos">
+                                            <a href="{{ url('tree_path', repository=repository[:-4], revision=commit.id, tree_path=patch.delta.new_file.path) }}#line-{{ line.new_lineno }}">{{ line.new_lineno }}</a>
                                         </td>
                                         <td class="content">{{ line.content }}</td>
                                     </tr>