diff --git a/theme/pages/homepage.html b/theme/pages/homepage.html
index 956b53ee..6fefd56e 100644
--- a/theme/pages/homepage.html
+++ b/theme/pages/homepage.html
@@ -15,7 +15,7 @@ <h3>Using Composer</h3>
 
 <h2>Support</h2>
 <ul>
-    <li>Issues: <a href="{{ config.repo_url }}issues">{{ config.repo_url|replace('https://', '') }}issues</a></li>
+    <li>Issues: <a href="{{ config.repo_url }}/issues">{{ config.repo_url|replace('https://', '') }}/issues</a></li>
     <li>Source: <a href="{{ config.repo_url }}">{{ config.repo_url|replace('https://', '') }}</a></li>
     <li>Chat: <a href="https://laminas.dev/chat">laminas.dev/chat</a></li>
     <li>Forum: <a href="https://discourse.laminas.dev/">discourse.laminas.dev</a></li>
diff --git a/update_mkdocs_yml.py b/update_mkdocs_yml.py
index d965dd2f..a5f80a30 100755
--- a/update_mkdocs_yml.py
+++ b/update_mkdocs_yml.py
@@ -43,7 +43,7 @@
         ]
     }
 
-mkdocs["extra"]["repo_name"] = mkdocs["repo_url"].replace("https://github.com/", "")
+mkdocs["extra"]["repo_name"] = mkdocs["repo_url"].replace("https://github.com/", "").rstrip("/")
 mkdocs["extra"]["base_url"] = "https://docs.laminas.dev/"
 
 if mkdocs["extra"]["project"] == "Components":