diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index d906ab6..a60eccf 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -41,8 +41,7 @@
 
       {% if config['DOC_APP_URL'] and repo.settings.get('project_documentation', True) %}
       <li {% if select == 'docs' %}class="selected" {% endif %}>
-        <a href="{{ config['DOC_APP_URL'] +  url_for('.view_repo', username=username,
-                    repo=repo.name) }}">Docs</a>
+        <a href="{{ url_for('.view_docs', username=username, repo=repo.name) }}">Docs</a>
       </li>
       {% endif %}
 
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index fc66057..55073ca 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1359,3 +1359,19 @@ def delete_branch(repo, branchname, username=None):
 
     return flask.redirect(
         flask.url_for('view_repo', repo=repo, username=username))
+
+
+@APP.route('/docs/<repo>/')
+@APP.route('/docs/<repo>/<path:filename>')
+@APP.route('/docs/fork/<username>/<repo>/')
+@APP.route('/docs/fork/<username>/<repo>/<path:filename>')
+def view_docs(repo, username=None, filename=None):
+    """ Display the documentation
+    """
+    repo_obj = pagure.lib.get_project(SESSION, repo, user=username)
+    return flask.render_template(
+        'docs.html',
+        repo=repo_obj,
+        username=username,
+        filename=filename,
+    )