# HG changeset patch
# User Armin Rigo <arigo@tunes.org>
# Date 1305467387 -7200
#      Sun May 15 15:49:47 2011 +0200
# Branch extradoc
# Node ID a26a095cfb2c899341525894b8ff739771a7d782
# Parent  3718e6480d931eb72078c9153b1b655225e55e35
Regen.

diff --git a/contact.html b/contact.html
--- a/contact.html
+++ b/contact.html
@@ -49,9 +49,9 @@
 <h1 class="title">Contact</h1>
 <ul class="simple">
 <li>irc: <strong>#pypy</strong> on <strong>irc.freenode.net</strong></li>
-<li>mailing list: <a class="reference external" href="http://codespeak.net/mailman/listinfo/pypy-dev">pypy-dev at codespeak.net</a></li>
+<li>mailing list: <a class="reference external" href="http://python.org/mailman/listinfo/pypy-dev">pypy-dev at python.org</a></li>
 <li>the <a class="reference external" href="https://codespeak.net/issue/pypy-dev/">bug tracker</a></li>
-<li>more on our <a class="reference external" href="http://codespeak.net/pypy/trunk/pypy/doc/">dev site</a>.</li>
+<li>more on our <a class="reference external" href="http://doc.pypy.org">dev site</a>.</li>
 </ul>
 </div>
 <div id="sidebar">
diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -70,10 +70,10 @@
 (This is the official release 1.5;
 for the most up-to-date version see below.)</p>
 <ul class="simple">
-<li><a class="reference external" href="http://pypy.org/download/pypy-1.5-linux.tar.bz2">Linux binary (32bit)</a></li>
-<li><a class="reference external" href="http://pypy.org/download/pypy-1.5-linux64.tar.bz2">Linux binary (64bit)</a></li>
-<li><a class="reference external" href="http://pypy.org/download/pypy-1.5-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
-<li><a class="reference external" href="http://pypy.org/download/pypy-1.5-win32.zip">Windows binary (32bit)</a> (BETA!) (you may need to install the <a class="reference external" href="http://www.microsoft.com/downloads/en/details.aspx?familyid=A7B7A05E-6DE6-4D3A-A423-37BF0912DB84">VS 2010 runtime libraries</a>)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux.tar.bz2">Linux binary (32bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux64.tar.bz2">Linux binary (64bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-win32.zip">Windows binary (32bit)</a> (BETA!) (you may need to install the <a class="reference external" href="http://www.microsoft.com/downloads/en/details.aspx?familyid=A7B7A05E-6DE6-4D3A-A423-37BF0912DB84">VS 2010 runtime libraries</a>)</li>
 </ul>
 <p>If your CPU is really old, it may not have SSE2.  In this case, you need
 to <a class="reference internal" href="#translate">translate</a> yourself with the option <tt class="docutils literal"><span class="pre">--jit-backend=x86-without-sse2</span></tt>.</p>
@@ -114,7 +114,7 @@
 <li><p class="first">Get the source code.  The following packages contain the source at
 the same revision as the above binaries:</p>
 <ul class="simple">
-<li><a class="reference external" href="http://pypy.org/download/pypy-1.5-src.tar.bz2">pypy-1.5-src.tar.bz2</a> (sources, Unix line endings)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2">pypy-1.5-src.tar.bz2</a> (sources, Unix line endings)</li>
 <li>pypy-1.5-src.zip (sources, Windows line endings) not available</li>
 </ul>
 <p>Or you can checkout the current trunk using <a class="reference external" href="http://mercurial.selenic.com/">Mercurial</a> (the trunk