diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 3f5b2f6..b5b7600 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -27,19 +27,25 @@
       </div>
 
 {% if content %}
-  {% if output_type == 'file' or output_type == 'binary' or output_type == 'image' %}
+  {% if output_type in ('file','binary','image','markup') %}
   <div class="card-block p-a-0">
         {% if content %}
-          {% if output_type == 'file' or output_type == 'binary' or output_type == 'image' %}
+          {% if output_type in ('file','binary','image','markup') %}
             <div class="file-button-bar">
-                {% if output_type=='file' and repo_admin %}
+                {% if output_type in ('file','markup') and repo_admin %}
                 <a class="btn btn-sm btn-secondary" href="{{ url_for('edit_file', username=username,
                             repo=repo.name, branchname=branchname,
                             filename=filename) }}" title="Edit file">Edit</a>
                 {% endif %}
+                {% if output_type == 'markup'  %}
+                <a class="btn btn-sm btn-secondary" href="{{ url_for('view_file', username=username,
+                            repo=repo.name, identifier=branchname,
+                            filename=filename, renderMarkup=false) }}" title="View as text">Text</a>
+                {% else %}
                 <a class="btn btn-secondary btn-sm" href="{{ url_for('view_file', username=username,
                             repo=repo.name, identifier=branchname,
                             filename=filename) }}" title="View as blob">Blob</a>
+                {% endif %}
                 <a class="btn btn-secondary btn-sm" href="{{ url_for('view_raw_file', username=username,
                             repo=repo.name, identifier=branchname,
                             filename=filename) }}" title="View as raw">Raw</a>
@@ -51,6 +57,10 @@
         {% autoescape false %}
         {{ content | format_loc}}
         {% endautoescape %}
+    {% elif output_type == 'markup' %}
+        {% autoescape false %}
+        {{ content | noJS }}
+        {% endautoescape %}
     {% elif output_type == 'image' %}
         <img src="{{ url_for('view_raw_file', username=username,
                     repo=repo.name, identifier=branchname,
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 22e7195..aeeae81 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -411,6 +411,7 @@ def view_file(repo, identifier, filename, username=None):
         flask.abort(404, 'File not found')
 
     if isinstance(content, pygit2.Blob):
+        disableMarkup = str(flask.request.args.get('renderMarkup')).lower() in ['0', 'false']
         ext = filename[filename.rfind('.'):]
         if ext in (
                 '.gif', '.png', '.bmp', '.tif', '.tiff', '.jpg',
@@ -423,6 +424,9 @@ def view_file(repo, identifier, filename, username=None):
                     'Failed to load image %s, error: %s', filename, err
                 )
                 output_type = 'binary'
+        elif ext in ('.rst', '.mk', '.md') and not disableMarkup:
+            content, safe = pagure.doc_utils.convert_readme(content.data, ext)
+            output_type = 'markup'
         elif not content.is_binary and pagure.lib.could_be_text(content.data):
             file_content = content.data.decode('utf-8')
             try: