diff --git a/MANIFEST b/MANIFEST
index b9f0a702d..c0c3d85ba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -60,7 +60,6 @@ py/apigen/tracer/testing/test_docgen.py
 py/apigen/tracer/testing/test_model.py
 py/apigen/tracer/testing/test_package.py
 py/apigen/tracer/tracer.py
-py/bin/_docgen.py
 py/bin/_findpy.py
 py/bin/_genscripts.py
 py/bin/gendoc.py
@@ -166,11 +165,6 @@ py/doc/example/pytest/test_failures.py
 py/doc/example/pytest/test_setup_flow_example.py
 py/doc/execnet.txt
 py/doc/future.txt
-py/doc/future/code_template.txt
-py/doc/future/planning.txt
-py/doc/future/planning2.txt
-py/doc/future/pylib_pypy.txt
-py/doc/future/rsession_todo.txt
 py/doc/greenlet.txt
 py/doc/impl-test.txt
 py/doc/index.txt
@@ -408,6 +402,7 @@ py/test/testing/test_collect.py
 py/test/testing/test_compat.py
 py/test/testing/test_config.py
 py/test/testing/test_conftesthandle.py
+py/test/testing/test_deprecated_api.py
 py/test/testing/test_doctest.py
 py/test/testing/test_event.py
 py/test/testing/test_outcome.py
diff --git a/README.txt b/README.txt
index 22c291fc4..62e5aac0e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 The py lib is a Python development support library featuring 
 the following tools and modules:
 
-* py.test: popular python testing tool 
+* py.test: automated testing tool
 * py.execnet: ad-hoc distributed execution
 * py.magic.greenlet: micro-threads
 * py.path:  uniform local and svn path objects 
@@ -17,4 +17,4 @@ have fun,
 
 holger krekel, holger at merlinux eu
 
-$Id: README.txt 57429 2008-08-18 15:08:39Z hpk $
+$Id: README.txt 57755 2008-09-02 12:26:22Z hpk $
diff --git a/setup.py b/setup.py
index be6edc833..3e5f8d634 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 """
     setup file for 'py' package based on:
 
-        https://codespeak.net/svn/py/trunk, revision=57550
+        svn+ssh://codespeak.net/svn/py/trunk, revision=57745
 
     autogenerated by gensetup.py
 """
@@ -191,11 +191,6 @@ def main():
                              'doc/example/pytest/test_setup_flow_example.py',
                              'doc/execnet.txt',
                              'doc/future.txt',
-                             'doc/future/code_template.txt',
-                             'doc/future/planning.txt',
-                             'doc/future/planning2.txt',
-                             'doc/future/pylib_pypy.txt',
-                             'doc/future/rsession_todo.txt',
                              'doc/greenlet.txt',
                              'doc/impl-test.txt',
                              'doc/index.txt',