diff --git a/pagure/docs_server.py b/pagure/docs_server.py
index 7129002..3e04e4a 100644
--- a/pagure/docs_server.py
+++ b/pagure/docs_server.py
@@ -121,18 +121,21 @@ def __get_tree_and_content(repo_obj, commit, path):
 
 
 @APP.route('/<repo>/')
-@APP.route('/<namespace>/<repo>/')
+@APP.route('/<namespace>.<repo>/')
 @APP.route('/<repo>/<path:filename>')
-@APP.route('/<namespace>/<repo>/<path:filename>')
+@APP.route('/<namespace>.<repo>/<path:filename>')
 @APP.route('/fork/<username>/<repo>/')
-@APP.route('/fork/<namespace>/<username>/<repo>/')
+@APP.route('/fork/<namespace>.<username>/<repo>/')
 @APP.route('/fork/<username>/<repo>/<path:filename>')
-@APP.route('/fork/<namespace>/<username>/<repo>/<path:filename>')
+@APP.route('/fork/<namespace>.<username>/<repo>/<path:filename>')
 def view_docs(repo, username=None, namespace=None, filename=None):
     """ Display the documentation
     """
+    if '.' in repo:
+        namespace, repo = repo.split('.', 1)
 
-    repo = pagure.lib.get_project(SESSION, repo, user=username, namespace=namespace)
+    repo = pagure.lib.get_project(
+        SESSION, repo, user=username, namespace=namespace)
 
     if not repo:
         flask.abort(404, 'Project not found')
diff --git a/pagure/templates/docs.html b/pagure/templates/docs.html
index 9dd3453..8975ca7 100644
--- a/pagure/templates/docs.html
+++ b/pagure/templates/docs.html
@@ -8,16 +8,16 @@
 {% block repo %}
 
 <iframe id="docframe" src="{{ config['DOC_APP_URL'] + url_for('.view_repo',
-        repo=repo.name,
+        repo=repo.namespace + '.' + repo.name if repo.namespace else repo.name,
         username=username,
-        namespace=repo.namespace,
         filename=filename) }}"
     frameborder="0" style="min-height:700px;width:100%"
     onload="resize_iframe()">
   <p>Your browser does not support iframe, please visit
   <a href="{{ config['DOC_APP_URL'] + url_for('.view_repo',
-        namespace=repo.namespace, username=username,
-        repo=repo.name, filename=filename)
+        repo=repo.namespace + '.' + repo.name if repo.namespace else repo.name,
+        username=username,
+        filename=filename)
     }}">the documentation directly</a>
   </p>
 </iframe>
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index 02f6a16..9c4494c 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -279,9 +279,8 @@
       <li class="nav-item pull-xs-right">
         <a class="nav-link" href="{{ config['DOC_APP_URL'] + url_for(
             '.view_repo',
-            repo=repo.name,
+            repo=repo.namespace + '.' + repo.name if repo.namespace else repo.name,
             username=username,
-            namespace=repo.namespace,
             filename=filename)
           }}" target="_blank" title="Open to a new tab" rel="noopener noreferrer">
           <span class="oi" data-glyph="external-link"></span>