diff --git a/doc/Makefile b/doc/Makefile
index bbcee6249b..35f62ae58a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,7 +1,7 @@
 # Makefile for Sphinx documentation
 #
 PYTHON       = python
-RST2HTML     = rst2html
+RST2HTML     = rst2html.py
 
 # You can set these variables from the command line.
 SPHINXOPTS   =
@@ -79,13 +79,14 @@ htmlhelp:
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in _build/htmlhelp."
 
-latex: $(PDFFILES)
+latex: html $(PDFFILES)
 	mkdir -p _build/latex _build/doctrees
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTSlatex) _build/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in _build/latex."
 	@echo "Set the environment variable LATEXMKOPTS='-xelatex -silent'"
 	@echo "And run \`make all' in that directory to run these through xelatex."
+	make -C _build/latex all-pdf
 
 .svg.pdf:
 	inkscape --file=$< --export-area-drawing --without-gui --export-pdf=$@
diff --git a/doc/src/conf.py b/doc/src/conf.py
index bd40367bae..d6090eaf19 100644
--- a/doc/src/conf.py
+++ b/doc/src/conf.py
@@ -90,11 +90,11 @@
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+show_authors = True
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
@@ -128,7 +128,7 @@
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+html_use_smartypants = True
 
 # Content template for the index page.
 #html_index = ''
@@ -141,7 +141,7 @@
 #html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_use_modindex = True
+html_use_modindex = True
 html_domain_indices = ['py-modindex']
 
 # If true, the reST sources are included in the HTML build as _sources/<name>.
@@ -155,10 +155,10 @@
 # ------------------------
 
 # The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+latex_paper_size = 'a4'
 
 # The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+latex_font_size = '12pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual], toctree_only).
@@ -204,7 +204,7 @@
 latex_show_pagerefs = True
 
 # We use False otherwise the module index gets generated twice.
-latex_use_modindex = False
+latex_use_modindex = True
 
 default_role = 'math'
 pngmath_divpng_args = ['-gamma 1.5', '-D 110']