diff --git a/index.html b/index.html
index 05f0b7ce3..f2a45e30e 100644
--- a/index.html
+++ b/index.html
@@ -75,15 +75,22 @@
     </p>
     <h2><a name="Links">Links</a></h2>
     <ul class="right">
-      <li><a href="https://github.com/cc65/cc65">Source Code</a>
+      <li>
+        <a href="https://github.com/cc65/cc65">Source Code</a>
       </li>
-      <li><a href="download/cc65-snapshot-win32.zip">Windows Snapshot</a>
+      <li>
+        <a href="http://sourceforge.net/projects/cc65/files/cc65-snapshot-win64.zip">
+          Windows Snapshot
+        </a>
       </li>
-      <li><a href="doc/">Documentation</a>
+      <li>
+        <a href="../doc">Documentation</a>
       </li>
-      <li><a href="https://github.com/cc65/wiki/wiki">Wiki</a>
+      <li>
+        <a href="https://github.com/cc65/wiki/wiki">Wiki</a>
       </li>
-      <li><a href="https://github.com/cc65/cc65/wiki/User-contributions">User Contributions</a>
+      <li>
+        <a href="http://sourceforge.net/projects/cc65/files/contrib">User Contributions</a>
       </li>
       <li>
         <a href="https://travis-ci.org/cc65/cc65/builds">
diff --git a/mailing-lists.html b/mailing-lists.html
index 7ff8c8338..1e9ba0ff9 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -69,12 +69,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="../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://cc65.github.io/mailarchive/"/>
+               <input type="hidden" name="sitesearch" value="http://cc65.github.io/mailarchive"/>
                <input type="submit" value="Google Search"/>
              </form>
          </li>