diff --git a/_templates/versions.html b/_templates/versions.html
index 0862a201e8d95..260ad54354c46 100644
--- a/_templates/versions.html
+++ b/_templates/versions.html
@@ -52,10 +52,10 @@
             <a href="https://qgis.org" target="_blank" rel="noopener noreferrer">{{ _('Project Home') }}</a>
           </dd>
           <dd>
-            <a href="https://github.com/qgis/pyqgis/tree/master" target="_blank" rel="noopener noreferrer">{{ _('Repository') }}</a>
+            <a href="https://github.com/qgis/pyqgis/issues" target="_blank" rel="noopener noreferrer">{{ _('Report Issue') }}</a>
           </dd>
           <dd>
-            <a href="https://github.com/qgis/QGIS/tree/{{ current_version }}" target="_blank" rel="noopener noreferrer">{{ _('Source Code') }}</a>
+            <a href="https://github.com/qgis/QGIS/tree/{{ version_branch }}" target="_blank" rel="noopener noreferrer">{{ _('Source Code') }}</a>
           </dd>
       </dl>
       <hr/>
diff --git a/conf.py.in b/conf.py.in
index 3231e7a6d6c04..bea256212a4bf 100644
--- a/conf.py.in
+++ b/conf.py.in
@@ -129,6 +129,8 @@ context = {
     'current_version': version,
     'version': version,
     'versions': [[v, url+v] for v in version_list],
+    'version_branch': ''.join(['release-', version]).replace('.',
+                                                        '_') if version != 'master' else 'master',
     'display_lower_left': True,
     # 'downloads': [ ['PDF', '/builders.pdf'], ['HTML', '/builders.tgz'] ],
 }