diff --git a/doc/gendoc.py b/doc/gendoc.py
index da7a9fc8..d83aed88 100755
--- a/doc/gendoc.py
+++ b/doc/gendoc.py
@@ -78,8 +78,8 @@ def texify(texfile):
 	else:
 		check_call(['pdflatex', texfile])
 		check_call(['bibtex',   texfile.replace('.tex', '.aux')])
-		#check_call(['pdflatex', texfile])
-		#check_call(['pdflatex', texfile])
+		check_call(['pdflatex', texfile])
+		check_call(['pdflatex', texfile])
 
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 with open('plugins_generated.tex', 'w') as f:
diff --git a/doc/images/bumpy_sphere.jpg b/doc/images/bumpy_sphere.jpg
new file mode 100644
index 00000000..661a543f
Binary files /dev/null and b/doc/images/bumpy_sphere.jpg differ
diff --git a/doc/main.bib b/doc/main.bib
index 4adf4cce..554e3185 100644
--- a/doc/main.bib
+++ b/doc/main.bib
@@ -10,7 +10,7 @@
 	title    = {{Building Volumetric Appearance Models of Fabric using Micro CT Imaging}},
   	journal  = {ACM Transactions on Graphics (Proceedings SIGGRAPH 2011)},
   	year     = {2011},
-	month    = {July}
+	month    = {7}
 }
 
 @article{Smits2005RGB,
@@ -325,7 +325,7 @@
 	year = {2012},
 	volume = {31},
 	number = {4},
-	month = {July}
+	month = {7}
 }
 
 @article{Hachisuka2009Stochastic,
@@ -378,11 +378,11 @@
 }
 
 @inproceedings{Ward1992Irradiance,
-   author = "Greg Ward and Paul Heckbert",
-   title = "Irradiance Gradients",
-   booktitle = "Eurographics Rendering Workshop",
-   pages = "85-98",
-   month = "May",
+   author = {Greg Ward and Paul Heckbert},
+   title = {Irradiance Gradients},
+   booktitle = {Eurographics Rendering Workshop},
+   pages = {85--98},
+   month = {5},
    year = "1992",
 }
 
@@ -392,7 +392,7 @@
 	journal = {SIGGRAPH Comput. Graph.},
 	volume = {22},
 	number = {4},
-	month = jun,
+	month = {6},
 	year = {1988},
 	pages = {85--92},
 	publisher = {ACM},
@@ -572,7 +572,7 @@
 	publisher = {OSA},
 	title = {Average irregularity representation of a rough surface for ray reflection},
 	volume = {65},
-	month = {May},
+	month = {5},
 	year = {1975}
 }
 
@@ -582,5 +582,17 @@
   journal = {Computer Graphics Forum},
   publisher = {Blackwell Publishing},
   year = {2014},
-  month = Jun
+  month = {6}
+}
+
+@article {Holzschuch2015,
+  author = {Holzschuch, Nicolas},
+  title = {Accurate Computation of Single Scattering in Participating Media with Refractive Boundaries},
+  journal = {Computer Graphics Forum},
+  publisher = {Wiley},
+  volume = {34},
+  number = {6},
+  pages = {48--59},
+  year = {2015},
+  MONTH = Sep
 }
diff --git a/doc/main.tex b/doc/main.tex
index a53bb232..77ae3b02 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -1,4 +1,6 @@
-\documentclass[footinclude=false,11pt,DIV11]{scrartcl}
+% !TEX engine = pdflatex
+% In case one tries to compile from within atom instead of gendoc.py
+\documentclass[footinclude=false,11pt,DIV=11]{scrartcl}
 
 % Wenzel's standard prelude
 % ----- 8< ----- 8< ------
@@ -40,8 +42,8 @@
 \setcounter{secnumdepth}{3}
 \setcounter{tocdepth}{3}
 
-\newcommand{\MitsubaVersion}{0.5.0}
-\newcommand{\MitsubaYear}{2014}
+\newcommand{\MitsubaVersion}{0.6.0}
+\newcommand{\MitsubaYear}{2017}
 
 \typearea[current]{last}
 \raggedbottom
@@ -60,6 +62,11 @@
 \addtokomafont{descriptionlabel}{\rmfamily}
 \pagestyle{scrheadings}
 
+% Section and subsubsection numbers in TOC need more numwidth
+\DeclareTOCStyleEntry[numwidth=3em]{default}{section}
+\DeclareTOCStyleEntry[numwidth=4em]{default}{subsection}
+\DeclareTOCStyleEntry[numwidth=5em]{default}{subsubsection}
+
 \usepackage[
     bookmarks,
     bookmarksnumbered,
@@ -76,6 +83,11 @@
     pdfstartview=FitH
 ]{hyperref}
 
+% Bibliography
+\usepackage{csquotes}
+\usepackage[backend=bibtex,style=numeric,uniquename=init]{biblatex}
+\addbibresource{main.bib}
+
 \definecolor{myblue}{rgb}{0,.1,.6}
 \definecolor{myred}{rgb}{0.63,.16,.16}
 \definecolor{lstshade}{gray}{0.95}
@@ -181,7 +193,6 @@
 \include{acknowledgements}
 \include{gpl-v3}
 
-\bibliographystyle{acm}
-\bibliography{main}
+\printbibliography[heading=bibintoc]
 
 \end{document}
diff --git a/src/bsdfs/normalmap.cpp b/src/bsdfs/normalmap.cpp
index b6cd9234..b1889901 100644
--- a/src/bsdfs/normalmap.cpp
+++ b/src/bsdfs/normalmap.cpp
@@ -34,7 +34,7 @@ MTS_NAMESPACE_BEGIN
  *     be affected by the normal map}
  * }
  *
- * This plugin is conceptually similar to the \pluginref{bump} map plugin
+ * This plugin is conceptually similar to the \pluginref{bumpmap} plugin
  * but uses a normal map instead of a bump map. A normal map is a RGB texture, whose color channels
  * encode the XYZ coordinates of the desired surface normals.
  * These are specified \emph{relative} to the local shading frame,
diff --git a/src/subsurface/singlescatter.cpp b/src/subsurface/singlescatter.cpp
index 246e9cbc..6d6b380b 100644
--- a/src/subsurface/singlescatter.cpp
+++ b/src/subsurface/singlescatter.cpp
@@ -70,7 +70,6 @@ static ref<Mutex> mutex = new Mutex;
  *
  * \renderings{
  *    \rendering{The bumpy sphere test scene rendered with amber material}{bumpy_sphere.jpg}
- *    \rendering{The Stanford Bunny rendered with a translucent material}{bunny_single.jpg}
  * }
 
  * This plugin implements the single scattering model in participating media