diff --git a/pagure/templates/blame.html b/pagure/templates/blame.html
new file mode 100644
index 0000000..311366a
--- /dev/null
+++ b/pagure/templates/blame.html
@@ -0,0 +1,226 @@
+{% extends "repo_master.html" %}
+
+{% block title %}Tree - {{
+    repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %}
+{% set tag = "home" %}
+
+
+{% block repo %}
+  <div class="row m-b-1">
+    <div class="col-sm-6">
+    <h3>
+      Blame {{ filename }}
+    </h3>
+    </div>
+
+    <div class="col-sm-6">
+      <div class="pull-xs-right">
+      <div class="button-label button-label-default">
+        {% if repo.is_fork %}
+        <span class="oi" data-glyph="fork"></span>
+        {{ repo.user.user }}/{{ repo.name }}
+        {% else %}
+        <span class="oi" data-glyph="document"></span> {{ repo.name }}
+        {% endif %}
+
+      </div>
+      {% if branchname %}
+        <div class="btn-group">
+          <button type="button" class="btn btn-secondary btn-sm dropdown-toggle"
+                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <span class="oi" data-glyph="random"> </span> {{ branchname }}
+          </button>
+          <div class="dropdown-menu dropdown-menu-right">
+            {% for branch in g.branches %}
+              {% if origin == 'view_tree' %}
+                <a class="dropdown-item" href="{{ url_for(
+                    'view_tree',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branch) }}">
+                  {{ branch }}
+                </a>
+              {% elif origin == 'view_file' %}
+                <a class="dropdown-item" href="{{ url_for(
+                    'view_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branch,
+                    filename=filename | unicode ) }}">
+                  {{ branch }}
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        </div>
+      {% endif %}
+    </div>
+  </div>
+
+  </div>
+    <div class="card">
+      <div class="card-header">
+        <ol class="breadcrumb">
+          <li>
+            <a href="{{ url_for('view_tree',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                identifier=branchname)
+          }}">
+              <span class="oi" data-glyph="random">
+              </span>&nbsp; {{ branchname }}
+            </a>
+          </li>
+        {% for file in filename.split('/') %}
+          {% if loop.first %}
+          {% set path = file %}
+          {% else %}
+          {% set path = path + '/' + file %}
+          {% endif %}
+          {% if loop.index != loop.length %}<li><a
+          href="{{ url_for('view_file',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                identifier=branchname,
+                filename=path | unicode)}}">
+            <span class="oi" data-glyph="folder"></span>&nbsp; {{ file }}</a>
+          </li>
+          {% elif file %}
+          <li class="active">
+            <span class="oi" data-glyph="{% if output_type == 'tree' %}folder{% else %}file{% endif %}">
+            </span>&nbsp; {{ file }}
+          </li>
+          {% endif %}
+        {% endfor %}
+        </ol>
+      </div>
+
+{% if content %}
+  {% if output_type in ('file','binary','image','markup', 'blame') %}
+  <div class="card-block p-a-0">
+        {% if content %}
+          {% if output_type in ('file','binary','image','markup', 'blame') %}
+            <div class="file-button-bar">
+                {% if output_type in ('file','markup') and g.repo_admin %}
+                <a class="btn btn-sm btn-secondary" href="{{ url_for(
+                    'edit_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    branchname=branchname,
+                    filename=filename | unicode) }}" title="Edit file">Edit</a>
+                {% endif %}
+                {% if output_type in ('file','markup') %}
+                <form class="btn btn-sm" method="POST" name="fork_project"
+                    action="{{ url_for('.fork_edit_file',
+                        repo=repo.name,
+                        username=username,
+                        namespace=repo.namespace,
+                        branchname=branchname, filename=filename) }}">
+                    <button class="btn btn-sm btn-secondary"
+                        onclick="fork_project.submit();">
+                            Fork and Edit
+                    </button>
+                    {{ forkbuttonform.csrf_token }}
+                </form>
+                {% endif %}
+                {% if output_type == 'markup'  %}
+                <a class="btn btn-sm btn-secondary" href="{{ url_for(
+                    'view_file', username=username, namespace=repo.namespace,
+                    repo=repo.name, identifier=branchname,
+                    filename=filename | unicode, text=True) }}"
+                    title="View as text">Text</a>
+                {% else %}
+                <a class="btn btn-secondary btn-sm" href="{{ url_for(
+                    'view_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branchname,
+                    filename=filename | unicode) }}" title="View as blob">Blob</a>
+                {% endif %}
+
+                <a class="btn btn-secondary btn-sm" href="{{ url_for(
+                    'view_raw_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branchname,
+                    filename=filename) | unicode }}" title="View as raw">Raw</a>
+            </div>
+          {% endif %}
+        {% endif %}
+
+
+    {% autoescape false %}
+    {{ content | blame_loc(repo, username, blame) }}
+    {% endautoescape %}
+  </div>
+  {% endif %}
+{% else %}
+No content found in this repository
+{% endif %}
+ </div> <!-- end .card-->
+
+ {% if readme %}
+ <div class="card">
+   <div class="card-header">
+     <strong>README{{readme_ext}}</strong>
+   </div>
+   <div class="card-block">
+   {% if safe %}
+     {{ readme | noJS |safe }}
+   {% else %}
+     {{ readme | noJS }}
+   {% endif %}
+ </div>
+ </div>
+ {% endif %}
+
+{% endblock %}
+
+{% block jscripts %}
+{{ super() }}
+<script type="text/javascript">
+function updateHighlight() {
+  var cls = "highlighted-line";
+  $('.' + cls).removeClass(cls)
+  if (location.hash !== '') {
+    var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
+    for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
+      $('[data-line-number=' + i + ']').closest('tr').addClass(cls);
+    }
+    return lines;
+  }
+  return [];
+}
+$(document).ready(function () {
+  var lines = updateHighlight();
+  if (lines) {
+    var offset = $('[data-line-number=' + lines[0] + ']').offset().top;
+    $('html, body').animate({scrollTop: offset}, 200);
+  }
+});
+$(window).on('hashchange', updateHighlight);
+var selected = [];
+$("[data-line-number]").click(function (ev) {
+  var line = $(this).attr('data-line-number');
+  if (ev.shiftKey) {
+    selected = selected.slice(-1).concat(line);
+  } else {
+    selected = [line];
+  }
+
+  var hash = '_' + selected[0];
+  if (selected.length === 2) {
+    hash = '_' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
+  }
+  window.location.hash = hash;
+  return false;
+});
+</script>
+{% endblock %}
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 092b77b..cce6543 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -240,6 +240,64 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None,
     return '\n'.join(output)
 
 
+@APP.template_filter('blame_loc')
+def blame_loc(loc, repo, username, blame):
+    """ Template filter putting the provided lines of code into a table
+    """
+    if loc is None:
+        return
+
+    output = [
+        '<div class="highlight">',
+        '<table class="code_table">'
+    ]
+
+    cnt = 1
+    for idx, line in enumerate(loc.split('\n')):
+        if line == '</pre></div>':
+            break
+        output.append(
+            '<tr><td class="cell1">'
+            '<a id="%(cnt)s" href="#%(cnt)s" data-line-number='
+            '"%(cnt_lbl)s"></a></td>'
+            % (
+                {
+                    'cnt': cnt,
+                    'cnt_lbl': cnt,
+                }
+            )
+        )
+
+        cnt += 1
+        if not line:
+            output.append(line)
+            continue
+        if line.startswith('<div'):
+            line = line.split('<pre style="line-height: 125%">')[1]
+        diff = blame.for_line(idx + 1)
+        output.append(
+            '<td class="cell_user">%s</td>' % author_to_user(
+                diff.orig_committer, with_name=False)
+        )
+        output.append(
+            '<td class="cell_commit"><a href="%s">%s</a></td>' % (
+                flask.url_for('view_commit',
+                        repo=repo.name,
+                        username=username,
+                        namespace=repo.namespace,
+                        commitid=diff.final_commit_id
+                ),
+                shorted_commit(diff.final_commit_id)
+            )
+        )
+        output.append('<td class="cell2"><pre>%s</pre></td>' % line)
+        output.append('</tr>')
+
+    output.append('</table></div>')
+
+    return '\n'.join(output)
+
+
 @APP.template_filter('wraps')
 def text_wraps(text, size=10):
     """ Template filter to wrap text at a specified size
@@ -331,7 +389,7 @@ def patch_to_diff(patch):
 
 
 @APP.template_filter('author2user')
-def author_to_user(author, size=16, cssclass=None):
+def author_to_user(author, size=16, cssclass=None, with_name=True):
     """ Template filter transforming a pygit2 Author object into a text
     either with just the username or linking to the user in pagure.
     """
@@ -340,11 +398,20 @@ def author_to_user(author, size=16, cssclass=None):
         return output
     user = pagure.lib.search_user(SESSION, email=author.email)
     if user:
-        output = "%s <a href='%s' %s>%s</a>" % (
-            avatar(user.default_email, size),
-            flask.url_for('view_user', username=user.username),
-            ('class="%s"' % cssclass) if cssclass else '',
-            author.name,
+        output = "%(avatar)s <a title='%(name)s' href='%(url)s' "\
+            "%(cssclass)s>%(username)s</a>"
+        if not with_name:
+            output = "<a title='%(name)s' href='%(url)s' "\
+                "%(cssclass)s>%(avatar)s</a>"
+
+        output = output % (
+            {
+                'avatar': avatar(user.default_email, size),
+                'url': flask.url_for('view_user', username=user.username),
+                'cssclass': ('class="%s"' % cssclass) if cssclass else '',
+                'username': user.username,
+                'name': author.name,
+            }
         )
 
     return output
@@ -379,6 +446,7 @@ def author_to_user_commits(author, link, size=16, cssclass=None):
 
     return output
 
+
 @APP.template_filter('InsertDiv')
 def insert_div(content):
     """ Template filter inserting an opening <div> and closing </div>
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index fe4592c..b2bbe8a 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -679,6 +679,52 @@ def view_raw_file(
     return (data, 200, headers)
 
 
+@APP.route('/<repo>/blame/<path:filename>')
+@APP.route('/<namespace>/<repo>/blame/<path:filename>')
+@APP.route(
+    '/fork/<username>/<repo>/blame/<path:filename>')
+@APP.route(
+    '/fork/<username>/<namespace>/<repo>/blame/<path:filename>')
+def view_blame_file(repo, filename, username=None, namespace=None):
+    """ Displays the blame of a file or a tree for the specified repo.
+    """
+    repo = flask.g.repo
+    reponame = flask.g.reponame
+    repo_obj = flask.g.repo_obj
+
+    branchname = flask.request.args.get('identifier', 'master')
+
+    if repo_obj.is_empty:
+        flask.abort(404, 'Empty repo cannot have a file')
+
+    commit = repo_obj[repo_obj.head.target]
+    content = __get_file_in_tree(
+        repo_obj, commit.tree, filename.split('/'), bail_on_tree=True)
+    if not content:
+        flask.abort(404, 'File not found')
+
+    if not isinstance(content, pygit2.Blob):
+        flask.abort(404, 'File not found')
+    if is_binary_string(content.data):
+        flask.abort(400, 'Binary files cannot be blamed')
+
+    content = ktc.to_bytes(content.data)
+    blame = repo_obj.blame(filename)
+
+    return flask.render_template(
+        'blame.html',
+        select='tree',
+        repo=repo,
+        origin='view_file',
+        username=username,
+        filename=filename,
+        branchname=branchname,
+        content=content,
+        output_type='blame',
+        blame=blame,
+    )
+
+
 @APP.route('/<repo>/c/<commitid>/')
 @APP.route('/<repo>/c/<commitid>')
 @APP.route('/<namespace>/<repo>/c/<commitid>/')