diff --git a/doc/Makefile b/doc/Makefile
index 3469e9959..4fbcc1251 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -39,8 +39,14 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
 
-install: clean html
-	rsync -avz _build/html/ code:www-pytest/
+install: html
+	@rsync -avz _build/html/ pytest.org:/www/pytest.org/latest
+
+installpdf: latexpdf
+	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/latest
+
+installall: clean install installpdf
+	@echo "done"
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/doc/_templates/localtoc.html b/doc/_templates/localtoc.html
index d12410a06..789ddb962 100644
--- a/doc/_templates/localtoc.html
+++ b/doc/_templates/localtoc.html
@@ -18,7 +18,7 @@
 <td>
         <a href="{{ pathto('index') }}">home</a>
 </td><td>
-        <a href="{{ pathto('contents') }}">contents</a>
+        <a href="{{ pathto('contents') }}">TOC contents</a>
 </td></tr><tr><td>
         <a href="{{ pathto('getting-started') }}">install</a>
 </td><td>
diff --git a/doc/getting-started.txt b/doc/getting-started.txt
index e24ed4e3c..f91b703bf 100644
--- a/doc/getting-started.txt
+++ b/doc/getting-started.txt
@@ -7,6 +7,8 @@ Installation and Getting Started
 
 **PyPI package name**: `pytest <http://pypi.python.org/pypi/pytest>`_
 
+**documentation as PDF**: `download latest <http://pytest.org/latest/pytest.pdf>`_
+
 .. _`getstarted`:
 
 Installation
diff --git a/doc/index.txt b/doc/index.txt
index b1343b4e3..d138cbad8 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -6,7 +6,7 @@ Welcome to pytest!
 - **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>`
+ - :ref:`comprehensive online <toc>` and `PDF documentation <pytest.pdf>`_
  - 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