diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py
index a42a9c947..b3ef661db 100755
--- a/docs/gen_reference_doc.py
+++ b/docs/gen_reference_doc.py
@@ -270,7 +270,8 @@ def parse_class(lno, lines, filename):
 		state = 'private'
 		class_type = 'class'
 
-	name = decl.split(':')[0].replace('class ', '').replace('struct ', '').strip()
+	name = decl.split(':')[0].replace('class ', '').replace('struct ', '').replace('TORRENT_FINAL', '').strip()
+
 
 	while lno < len(lines):
 		l = lines[lno].strip()
diff --git a/docs/makefile b/docs/makefile
index eec1ae742..723507d73 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -55,15 +55,15 @@ FIGURES = \
 	disk_cache \
 	troubleshooting
 
-rst: $(TARGETS:=.rst) todo.html
-
 html: $(TARGETS:=.html) $(FIGURES:=.png) todo.html
 
+rst: $(TARGETS:=.rst) todo.html
+
 pdf: $(TARGETS:=.pdf) $(FIGURES:=.eps)
 
 epub: $(TARGETS:=.epub) $(FIGURES:=.png)
 
-all: html
+all: html pdf
 
 settings.rst: ../include/libtorrent/settings_pack.hpp
 	python gen_settings_doc.py
diff --git a/docs/read_disk_buffers.png b/docs/read_disk_buffers.png
index 72e07defa..80862a514 100644
Binary files a/docs/read_disk_buffers.png and b/docs/read_disk_buffers.png differ
diff --git a/docs/storage.png b/docs/storage.png
index f02d2852a..e4207ef37 100644
Binary files a/docs/storage.png and b/docs/storage.png differ