diff --git a/Makefile.am b/Makefile.am
index 401bf7542..27a0e2732 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ docs/client_test.rst docs/client_test.html \
docs/dht_extensions.html docs/dht_extensions.rst \
docs/make_torrent.html docs/make_torrent.rst \
docs/examples.html docs/examples.rst \
+docs/tuning.html docs/tuning.rst \
docs/features.html docs/features.rst \
docs/libtorrent_plugins.html docs/libtorrent_plugins.rst \
docs/arctic_thumb.png \
@@ -42,9 +43,12 @@ docs/pump.png \
docs/bubba.png \
docs/firetorrent.png \
docs/read_disk_buffers.png \
-docs/read_disk_buffers.dot \
+docs/read_disk_buffers.gaffle \
docs/write_disk_buffers.png \
-docs/write_disk_buffers.dot \
+docs/write_disk_buffers.gaffle \
+docs/storage.png \
+docs/disk_buffer.png \
+docs/disk_buffer_before_optimization.png \
docs/unicode_support.png docs/client_test.png docs/style.css Jamfile project-root.jam \
libtorrent-rasterbar.pc \
bindings/README.txt \
diff --git a/docs/index.html b/docs/index.html
index 8ceb6d721..96fd9c1c9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,6 +39,7 @@
api documentation
create torrents
running tests
+tuning
screenshot
mailing list (archive)
who's using libtorrent?
diff --git a/docs/index.rst b/docs/index.rst
index a0d55fdc8..57c2c127d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,6 +9,7 @@
* `api documentation`_
* `create torrents`_
* `running tests`_
+* `tuning`_
* screenshot_
* `mailing list`_ (archive_)
* `who's using libtorrent?`_
@@ -54,6 +55,7 @@ libtorrent
.. _`api documentation`: manual.html
.. _`create torrents`: make_torrent.html
.. _`running tests`: running_tests.html
+.. _`tuning`: tuning.html
.. _screenshot: client_test.png
.. _`extensions protocol`: extension_protocol.html
.. _`plugin interface`: libtorrent_plugins.html
diff --git a/docs/makefile b/docs/makefile
index 16469044a..a712c0ef0 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -16,7 +16,8 @@ TARGETS = index \
libtorrent_plugins \
python_binding \
projects \
- running_tests
+ running_tests \
+ tuning
FIGURES = read_disk_buffers write_disk_buffers
diff --git a/docs/tuning.html b/docs/tuning.html
new file mode 100644
index 000000000..ee0e0d068
--- /dev/null
+++ b/docs/tuning.html
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+libtorrent manual
+
+
+
+
+