diff --git a/mailing-lists.html b/mailing-lists.html
index 67f144340..750347524 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -51,9 +51,8 @@
     </p>
     <h2><a name="cc65-git">cc65 Git Commits</a></h2>
     <p>This mailing list receives a message for every push to the
-       <a href="https://github.com/oliverschmidt/cc65">GitHub cc65
-       source code repository</a>. Subcribe to it if you want to be informed of
-       every change made to the source code.
+       <a href="https://github.com/cc65/cc65">GitHub cc65 source code repository</a>.
+       Subcribe to it if you want to be informed of every change made to the source code.
        <ul class="right">
          <li><a href="https://lists.sourceforge.net/lists/listinfo/cc65-git">
              Subscription</a>
@@ -74,12 +73,12 @@
     <p>This mailing list was formerly the main communication media of the cc65
        community. The threads there still hold a wealth of information on cc65.
        <ul class="right">
-         <li><a href="http://oliverschmidt.github.io/cc65/mailarchive/">
+         <li><a href="mailarchive/">
              Archive</a>
          </li>
          <li><form method="get" action="http://www.google.com/search">Search
                <input type="text" name="q" maxlength="255"/>
-               <input type="hidden" name="sitesearch" value="http://oliverschmidt.github.io/cc65/mailarchive/"/>
+               <input type="hidden" name="sitesearch" value="http://cc65.github.io/cc65/mailarchive/"/>
                <input type="submit" value="Google Search"/>
              </form>
          </li>