diff --git a/compat.html b/compat.html
index ea25359f9eda5d0b7cc9e414db75e14cdd80fb99_Y29tcGF0Lmh0bWw=..75adcfc90ceaf15ca5641bca114b3d994fcb2baa_Y29tcGF0Lmh0bWw= 100644
--- a/compat.html
+++ b/compat.html
@@ -47,7 +47,7 @@
 <div>
 <div id="main">
 <h1 class="title">Python compatibility</h1>
-<p>PyPy implements the Python language version 2.5. It supports all of the core
+<p>PyPy implements the Python language version 2.7.1. It supports all of the core
 language, passing Python test suite (with minor modifications that were
 already accepted in the main python in newer versions). It supports most
 of the commonly used Python <a class="reference external" href="http://docs.python.org/library/">standard library modules</a>; details below.</p>
@@ -51,8 +51,8 @@
 language, passing Python test suite (with minor modifications that were
 already accepted in the main python in newer versions). It supports most
 of the commonly used Python <a class="reference external" href="http://docs.python.org/library/">standard library modules</a>; details below.</p>
-<p>PyPy has <strong>alpha-level</strong> support for the <a class="reference external" href="http://docs.python.org/c-api/">CPython C API</a>, however, as of 1.4.1
-release this feature is not yet complete. Most libraries will require
+<p>PyPy has <strong>alpha/beta-level</strong> support for the <a class="reference external" href="http://docs.python.org/c-api/">CPython C API</a>, however, as of 1.5
+release this feature is not yet complete. Many libraries will require
 a bit of effort to work, but there are known success stories. Check out
 PyPy blog for updates.</p>
 <p>C extensions need to be recompiled for PyPy in order to work. Depending on
@@ -56,14 +56,7 @@
 a bit of effort to work, but there are known success stories. Check out
 PyPy blog for updates.</p>
 <p>C extensions need to be recompiled for PyPy in order to work. Depending on
-your build system, it might work out of the box or will be slightly harder.
-In order to instruct pypy to load a CPython extension (compiled with supplied
-Python.h), run following line:</p>
-<pre class="literal-block">
-import cpyext
-</pre>
-<p>before importing any extensions. You can put this line in your PYTHONSTARTUP
-file if you want this to be enabled permanently.</p>
+your build system, it might work out of the box or will be slightly harder.</p>
 <p>Standard library modules supported by PyPy, in alphabetical order:</p>
 <ul class="simple">
 <li><tt class="docutils literal">__builtin__ __pypy__ _ast _bisect _codecs _lsprof _minimal_curses _random _rawffi _ssl _socket _sre _weakref array bz2 cStringIO cpyext crypt errno exceptions fcntl&nbsp; gc itertools marshal math md5 mmap operator parser posix pyexpat select sha signal struct symbol sys termios thread time token unicodedata zipimport zlib</tt></li>
@@ -106,7 +99,7 @@
 <p>won't work.</p>
 </li>
 </ul>
-<p>A more complete list is available at <a class="reference external" href="http://codespeak.net/pypy/dist/pypy/doc/cpython_differences.html">our dev site</a>.</p>
+<p>A more complete list is available at <a class="reference external" href="http://codespeak.net/pypy/trunk/pypy/doc/cpython_differences.html">our dev site</a>.</p>
 </div>
 <div id="sidebar">
 <ul>
diff --git a/download.html b/download.html
index ea25359f9eda5d0b7cc9e414db75e14cdd80fb99_ZG93bmxvYWQuaHRtbA==..75adcfc90ceaf15ca5641bca114b3d994fcb2baa_ZG93bmxvYWQuaHRtbA== 100644
--- a/download.html
+++ b/download.html
@@ -125,7 +125,7 @@
 hg clone http://bitbucket.org/pypy/pypy
 </pre>
 </li>
-<li><p class="first">Make sure you installed the dependencies.  See the list <a class="reference external" href="http://codespeak.net/pypy/dist/pypy/doc/getting-started-python.html#translating-the-pypy-python-interpreter">here</a>.</p>
+<li><p class="first">Make sure you installed the dependencies.  See the list <a class="reference external" href="http://codespeak.net/pypy/trunk/pypy/doc/getting-started-python.html#translating-the-pypy-python-interpreter">here</a>.</p>
 </li>
 <li><p class="first">Enter the <tt class="docutils literal">goal</tt> directory:</p>
 <pre class="literal-block">
@@ -159,7 +159,7 @@
 is delicate.  It requires using either MSVC or gcc with no particularly
 fancy options.  It does not work e.g. with clang, or if you pass uncommon
 options with the <tt class="docutils literal">CFLAGS</tt> environment variable.  You can also try to
-compile PyPy with the <a class="reference external" href="http://codespeak.net/pypy/dist/pypy/doc/config/translation.gcrootfinder.html">shadow stack</a> option.</li>
+compile PyPy with the <a class="reference external" href="http://codespeak.net/pypy/trunk/pypy/doc/config/translation.gcrootfinder.html">shadow stack</a> option.</li>
 </ul>
 </div>
 <div class="section" id="checksums">
diff --git a/features.html b/features.html
index ea25359f9eda5d0b7cc9e414db75e14cdd80fb99_ZmVhdHVyZXMuaHRtbA==..75adcfc90ceaf15ca5641bca114b3d994fcb2baa_ZmVhdHVyZXMuaHRtbA== 100644
--- a/features.html
+++ b/features.html
@@ -85,7 +85,7 @@
 filesystem.  You don't have to put <tt class="docutils literal">untrusted.py</tt> in the real <tt class="docutils literal">/tmp</tt>
 directory at all.</p>
 <p>To read more about its features, try <tt class="docutils literal">pypy_interact.py <span class="pre">--help</span></tt> or go to
-<a class="reference external" href="http://codespeak.net/pypy/dist/pypy/doc/sandbox.html">our dev site</a>.</p>
+<a class="reference external" href="http://codespeak.net/pypy/trunk/pypy/doc/sandbox.html">our dev site</a>.</p>
 </div>
 <div class="section" id="stackless">
 <h1>Stackless</h1>