diff --git a/py/doc/coding-style.txt b/py/doc/coding-style.txt
index f54741b08..caaec3b61 100644
--- a/py/doc/coding-style.txt
+++ b/py/doc/coding-style.txt
@@ -70,4 +70,4 @@ Miscellaneous
 
 .. _`PEP 8 Style Guide for Python Code`: http://www.python.org/peps/pep-0008.html
 .. _`py-dev mailing list`: http://codespeak.net/mailman/listinfo/py-dev 
-.. _`future`: future/future.html
+.. _`future`: future.html
diff --git a/py/doc/conftest.py b/py/doc/conftest.py
index 02682076f..8a29265e4 100644
--- a/py/doc/conftest.py
+++ b/py/doc/conftest.py
@@ -21,7 +21,7 @@ option = py.test.config.addoptions("documentation check options",
 ) 
 
 def get_apigen_relpath():
-    return py.test.config.option.apigen_relpath + "/"
+    return py.test.config.option.apigen_relpath.rstrip('\/') + "/"
 
 def deindent(s, sep='\n'):
     leastspaces = -1
diff --git a/py/doc/contact.txt b/py/doc/contact.txt
index b22416125..811ff95e7 100644
--- a/py/doc/contact.txt
+++ b/py/doc/contact.txt
@@ -53,7 +53,7 @@ adopted in similar ways.
 
 .. _`zope3`: http://zope3.zwiki.org/
 .. _twisted: http://www.twistedmatrix.org 
-.. _future: future/future.html 
+.. _future: future.html 
 
 .. _`get an account`:  
 
diff --git a/py/doc/future/future.txt b/py/doc/future.txt
similarity index 98%
rename from py/doc/future/future.txt
rename to py/doc/future.txt
index 7c33d45f9..c4b5ba698 100644
--- a/py/doc/future/future.txt
+++ b/py/doc/future.txt
@@ -50,7 +50,7 @@ both of which can be independently transported
 across the network.  The programs who "own" 
 these endpoints remain connected. 
 
-.. _`py.execnet`: ../execnet.html
+.. _`py.execnet`: execnet.html
 
 Benchmarking and persistent storage 
 =========================================
@@ -72,7 +72,7 @@ decreased considerably.
 .. _`future book`: future.html 
 .. _`PEP-324 subprocess module`: http://www.python.org/peps/pep-0324.html
 .. _`subprocess implementation`: http://www.lysator.liu.se/~astrand/popen5/
-.. _`py.test`: ../test.html
+.. _`py.test`: test.html
 
 
 .. _`general-path`: 
diff --git a/py/doc/index.txt b/py/doc/index.txt
index f77c21004..6ccfa8e0f 100644
--- a/py/doc/index.txt
+++ b/py/doc/index.txt
@@ -55,6 +55,6 @@ Background and Motivation information
 .. _`py lib scripts`: bin.html
 .. _`py.xml`: xml.html 
 .. _`Why What how py?`: why_py.html 
-.. _`future`: future/future.html 
+.. _`future`: future.html 
 .. _`miscellaneous features`: misc.html 
 
diff --git a/py/doc/misc.txt b/py/doc/misc.txt
index 19436a61b..befa5493e 100644
--- a/py/doc/misc.txt
+++ b/py/doc/misc.txt
@@ -142,10 +142,10 @@ interested to hear about them. If you are running a Python older than 2.4 you
 will have to install the `pywin32 package`_.
 
 
-.. _`future book`: future/future.html 
+.. _`future book`: future.html 
 .. _`PEP-324 subprocess module`: http://www.python.org/peps/pep-0324.html
 .. _`subprocess implementation`: http://www.lysator.liu.se/~astrand/popen5/
-.. _`a more general view on path objects`: future/future.html#general-path
+.. _`a more general view on path objects`: future.html#general-path
 .. _`pywin32 package`: http://pywin32.sourceforge.net/
 
 finding an executable local path
diff --git a/py/doc/why_py.txt b/py/doc/why_py.txt
index 8f41fc93d..fad7edca5 100644
--- a/py/doc/why_py.txt
+++ b/py/doc/why_py.txt
@@ -181,7 +181,7 @@ in 2006 and 2007 major parts of the py lib.
 .. _`py-dev mailing list`: http://codespeak.net/mailman/listinfo/py-dev 
 .. _`test environment`: test.html 
 .. _`PyPy`: http://codespeak.net/pypy
-.. _future: future/future.html
+.. _future: future.html
 .. _`py.test tool and library`: test.html
 .. _merlinux: http://merlinux.de