diff --git a/plinth/templates/404.html b/plinth/templates/404.html
index 8c0fcc69c..23c06b8bf 100644
--- a/plinth/templates/404.html
+++ b/plinth/templates/404.html
@@ -27,7 +27,7 @@
 <p>Requested page {{ request_path }} was not found.</p>
 
 <p>If you believe this missing page should exist, please file a bug with either
-   the Plinth project (<a href="https://github.com/NickDaly/Plinth/issues">it
+   the Plinth project (<a href="https://github.com/freedombox/Plinth/issues">it
    has an issue tracker</a>) or the people responsible for the module you are
    trying to access.</p>
 
diff --git a/plinth/templates/500.html b/plinth/templates/500.html
index 0863ec630..7dd5e8244 100644
--- a/plinth/templates/500.html
+++ b/plinth/templates/500.html
@@ -26,7 +26,7 @@
 
 <p>This is an internal error and not something you caused or can fix.  Please
    report the error on
-   the <a href="https://github.com/NickDaly/Plinth/issues">bug tracker</a> so we
-   can fix it.</p>
+   the <a href="https://github.com/freedombox/Plinth/issues">bug tracker</a> so
+   we can fix it.</p>
 
 {% endblock %}