diff --git a/CHANGELOG b/CHANGELOG
index 1e24c029d..bcb0ac7d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ Changes between 2.0.3 and 2.1.0.DEV
 - show releaselevel information in test runs for pypy
 - reworked doc pages for better navigation and PDF generation
 - report KeyboardInterrupt even if interrupted during session startup
+- fix issue 35 - provide PDF doc version and download link from index page
 
 Changes between 2.0.2 and 2.0.3
 ----------------------------------------------
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 718bc2374..99625ddbf 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.1.0.dev11'
+__version__ = '2.1.0.dev12'
diff --git a/doc/conf.py b/doc/conf.py
index dcf14f03c..270aa65ad 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,11 +48,10 @@ copyright = u'2011, holger krekel et alii'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '2.0'
 # The full version, including alpha/beta/rc tags.
 import pytest
 release = pytest.__version__
+# The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -184,7 +183,7 @@ htmlhelp_basename = 'pytestdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'pytest.tex', u'pytest Documentation',
+  ('contents', 'pytest.tex', u'pytest Documentation',
    u'holger krekel et alii', 'manual'),
 ]
 
@@ -228,7 +227,7 @@ man_pages = [
 epub_title = u'pytest'
 epub_author = u'holger krekel et alii'
 epub_publisher = u'holger krekel et alii'
-epub_copyright = u'2010, holger krekel et alii'
+epub_copyright = u'2011, holger krekel et alii'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/doc/contents.txt b/doc/contents.txt
index dc09b8e9c..d0db9b6d5 100644
--- a/doc/contents.txt
+++ b/doc/contents.txt
@@ -1,9 +1,13 @@
 
 .. _toc:
 
-Table of Contents
+Full pytest documenation
 ========================
 
+`Download latest version as PDF <http://media.readthedocs.org/pdf/pytest/latest/pytest.pdf>`_
+
+.. `Download latest version as EPUB <http://media.readthedocs.org/epub/pytest/latest/pytest.epub>`_
+
 .. toctree::
    :maxdepth: 2
 
diff --git a/doc/index.txt b/doc/index.txt
index d9a52a44e..b2c91868b 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -6,11 +6,11 @@ Welcome to pytest / features
 - **a mature full-featured testing tool**
 
  - runs on Posix/Windows, Python 2.4-3.2, PyPy and Jython
+ - :ref:`comprehensive online and PDF documentation <toc>`
  - continuously `tested on many Python interpreters <http://hudson.testrun.org/view/pytest/job/pytest/>`_
  - used in :ref:`many projects and organisations <projects>`, in test
    suites ranging from 10 to 10s of thousands of tests
- - has :ref:`comprehensive documentation <toc>`
- - comes with :ref:`tested examples <examples>`
+ - comes with many :ref:`tested examples <examples>`
  - supports :ref:`good integration practises <goodpractises>`
 
 - **provides no-boilerplate testing**
diff --git a/setup.py b/setup.py
index 0f0258a3d..b02c9c31e 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.1.0.dev11',
+        version='2.1.0.dev12',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],