diff --git a/progit/templates/commit.html b/progit/templates/commit.html
index aad4ae5..970123e 100644
--- a/progit/templates/commit.html
+++ b/progit/templates/commit.html
@@ -7,13 +7,24 @@
 {% block content %}
 
 <h2>
+  {% if '/fork/' in request.url %}
+  <a href="{{ url_for('view_fork_repo', username=username, repo=repo)}}">
+  {% else %}
   <a href="{{ url_for('view_repo', repo=repo)}}">
+  {% endif %}
     {{ repo.split('.git')[0] }}
   </a>
 
+  {% if '/fork/' in request.url %}
+  (<a href="{{ url_for('view_fork_tree', username=username,
+               repo=repo, identifier=commitid) }}"
+    >tree</a>)
+  {% else %}
   (<a href="{{ url_for('view_tree',
                repo=repo, identifier=commitid) }}"
     >tree</a>)
+  {% endif %}
+
 </h2>
 
 <h3>Commit: {{ commitid }}</h3>
@@ -37,8 +48,14 @@
     <td>Parent</td>
     <td>
       {% for parent in commit.parents %}
-      <a href="{{ url_for('view_commit',
+        {% if '/fork/' in request.url %}
+        <a href="{{ url_for('view_fork_commit', username=username,
                   repo=repo, commitid=parent.oid.hex) }}">
+        {% else %}
+        <a href="{{ url_for('view_commit',
+                  repo=repo, commitid=parent.oid.hex) }}">
+        {% endif %}
+
         {{ parent.oid.hex }}
       </a> <br />
       {% endfor %}
diff --git a/progit/templates/file.html b/progit/templates/file.html
index 94017d0..15c2466 100644
--- a/progit/templates/file.html
+++ b/progit/templates/file.html
@@ -7,12 +7,21 @@
 {% block content %}
 
 <h2>
-  <a href="{{ url_for('view_repo',
-              repo=repo)}}">
+  {% if '/fork/' in request.url %}
+  <a href="{{ url_for('view_fork_repo', username=username, repo=repo)}}">
+  {% else %}
+  <a href="{{ url_for('view_repo', repo=repo)}}">
+  {% endif %}
     {{ repo.split('.git')[0] }}
   </a>
-  : <a href="{{ url_for('view_tree',
+  :
+  {% if '/fork/' in request.url %}
+    <a href="{{ url_for('view_fork_tree', username=username,
                 repo=repo, identifier=branchname) }}">
+  {% else %}
+    <a href="{{ url_for('view_tree',
+                repo=repo, identifier=branchname) }}">
+  {% endif %}
   {{ branchname }}</a>/{%
   for file in filename.split('/') %}
     {% if loop.first %}
@@ -21,10 +30,16 @@
     {% set path = path + '/' + file %}
     {% endif %}
     {% if loop.index != loop.length %}
-<a href="{{ url_for('view_file',
+{% if '/fork/' in request.url
+    %}<a href="{{ url_for('view_fork_file', username=username,
             repo=repo, identifier=branchname,
             filename=path)}}"
-      >{{ file }}</a>/{%
+      >{{ file }}</a>/
+{%
+else %}<a href="{{ url_for('view_file',
+            repo=repo, identifier=branchname,
+            filename=path)}}"
+      >{{ file }}</a>/{% endif %}{%
     else %}
 {{ file }}
     {% endif %}
@@ -44,10 +59,16 @@
       {% if entry.filemode == 16384 %}
       [ ]
       {% endif %}
+      {% if '/fork/' in request.url %}
+      <a href="{{ url_for('view_fork_file', username=username,
+                repo=repo, identifier=branchname,
+                filename=filename + '/' + entry.name if filename else entry.name) }}">
+      {% else %}
       <a href="{{ url_for('view_file',
                 repo=repo,
                 identifier=branchname,
                 filename=filename + '/' + entry.name if filename else entry.name) }}">
+      {% endif %}
         {{ entry.name }}
       </a>
       {{ entry.hex }}
diff --git a/progit/templates/repo_info.html b/progit/templates/repo_info.html
index 2f947a7..cf109a6 100644
--- a/progit/templates/repo_info.html
+++ b/progit/templates/repo_info.html
@@ -6,7 +6,11 @@
 
 {% block content %}
 <h2>
+  {% if '/fork/' in request.url %}
+  <a href="{{ url_for('view_fork_repo', username=username, repo=repo)}}">
+  {% else %}
   <a href="{{ url_for('view_repo', repo=repo)}}">
+  {% endif %}
     {{ repo.split('.git')[0] }}
   </a>
   {% if branchname %} ({{ branchname }}) {% endif %}
@@ -18,13 +22,23 @@
   <ul>
     {% for branch in branches %}
     <li>
+      {% if '/fork/' in request.url %}
+        <a href="{{ url_for('view_fork_repo_branch',
+                  username=username, repo=repo, branchname=branch) }}">
+      {% else %}
       <a href="{{ url_for('view_repo_branch',
                   repo=repo, branchname=branch) }}">
+      {% endif %}
         {{ branch }}
       </a>
-      (<a href="{{ url_for('view_log',
-                   repo=repo, branchname=branch) }}"
-        >logs</a>)
+      {% if '/fork/' in request.url %}
+        (<a href="{{ url_for('view_fork_log', username=username,
+                   repo=repo, branchname=branch) }}">logs</a>)
+      {% else %}
+        (<a href="{{ url_for('view_log',
+                   repo=repo, branchname=branch) }}">logs</a>)
+      {% endif %}
+
     </li>
     {% endfor %}
   </ul>
@@ -67,8 +81,14 @@
   <ul>
     {% for commit in last_commits %}
     <li>
-      <a href="{{ url_for('view_commit',
+        {% if '/fork/' in request.url %}
+          <a href="{{ url_for('view_fork_commit', username=username,
+                  repo=repo, commitid=commit.hex) }}">
+        {% else %}
+          <a href="{{ url_for('view_commit',
                   repo=repo, commitid=commit.hex) }}">
+        {% endif %}
+
         {{ commit.hex[:6] }}
       </a>
       {{ commit.message.split('\n')[0] }}
@@ -86,8 +106,13 @@
         {% if entry.filemode == 16384 %}
         [ ]
         {% endif %}
-        <a href="{{ url_for('view_file',
+        {% if '/fork/' in request.url %}
+          <a href="{{ url_for('view_fork_file', username=username,
                     repo=repo, identifier=branchname, filename=entry.name) }}">
+        {% else %}
+          <a href="{{ url_for('view_file',
+                    repo=repo, identifier=branchname, filename=entry.name) }}">
+        {% endif %}
           {{ entry.name }}
         </a>
         {{ entry.hex }}
diff --git a/progit/templates/user_info.html b/progit/templates/user_info.html
index 991fce8..a2084fd 100644
--- a/progit/templates/user_info.html
+++ b/progit/templates/user_info.html
@@ -34,11 +34,12 @@
 </table>
 {% endif %}
 
-<section class="repos_list">
+<section class="fork_list">
+  <h3>Forked repos</h3>
   <ul>
     {% for repo in repos %}
     <li>
-      <a href="{{ url_for('view_repo', repo=repo)}}">
+      <a href="{{ url_for('view_fork_repo', username=username, repo=repo)}}">
         {{ repo.split('.git')[0] }}
       </a>
       <span class="commit_date">