diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index ef559f3..9478de5 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -122,9 +122,11 @@
         {{ content | format_loc }}
         {% endautoescape %}
     {% elif output_type == 'markup' %}
+        <div class="m-a-2">
         {% autoescape false %}
         {{ content | noJS }}
         {% endautoescape %}
+      </div>
     {% elif output_type == 'image' %}
         <img src="{{ url_for('view_raw_file', username=username,
                     repo=repo.name, identifier=branchname,
@@ -177,6 +179,21 @@ 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 %}
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 929ffd7..19f98ae 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -492,6 +492,10 @@ def view_file(repo, identifier, filename, username=None):
         flask.abort(404, 'File not found')
 
     encoding = None
+    readme = None
+    safe = False
+    readme_ext = None
+
     if isinstance(content, pygit2.Blob):
         rawtext = str(flask.request.args.get('text')).lower() in ['1', 'true']
         ext = filename[filename.rfind('.'):]
@@ -532,6 +536,16 @@ def view_file(repo, identifier, filename, username=None):
             output_type = 'binary'
     else:
         content = sorted(content, key=lambda x: x.filemode)
+        for i in content:
+            name, ext = os.path.splitext(i.name)
+            if name == 'README':
+                readme_file = __get_file_in_tree(
+                    repo_obj, content, [i.name]).data
+
+                readme, safe = pagure.doc_utils.convert_readme(
+                    readme_file, ext)
+
+                readme_ext = ext
         output_type = 'tree'
 
     headers = {}
@@ -551,6 +565,9 @@ def view_file(repo, identifier, filename, username=None):
             content=content,
             output_type=output_type,
             repo_admin=is_repo_admin(repo),
+            readme=readme,
+            readme_ext=readme_ext,
+            safe=safe,
         ),
         200,
         headers
@@ -790,6 +807,19 @@ def view_tree(repo, identifier=None, username=None):
 
         if commit:
             content = sorted(commit.tree, key=lambda x: x.filemode)
+            readme = None
+            safe = False
+            readme_ext = None
+            for i in commit.tree:
+                name, ext = os.path.splitext(i.name)
+                if name == 'README':
+                    readme_file = __get_file_in_tree(
+                        repo_obj, commit.tree, [i.name]).data
+
+                    readme, safe = pagure.doc_utils.convert_readme(
+                        readme_file, ext)
+
+                    readme_ext = ext
         output_type = 'tree'
 
     return flask.render_template(
@@ -805,6 +835,9 @@ def view_tree(repo, identifier=None, username=None):
         content=content,
         output_type=output_type,
         repo_admin=is_repo_admin(repo),
+        readme=readme,
+        readme_ext=readme_ext,
+        safe=safe,
     )