diff --git a/docs/building.html b/docs/building.html
index 0a020be3f..0d75b9ab5 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
diff --git a/docs/client_test.html b/docs/client_test.html
index 8149e67c0..b723b0d44 100644
--- a/docs/client_test.html
+++ b/docs/client_test.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>client_test example program</title>
diff --git a/docs/contributing.html b/docs/contributing.html
index 64749656f..e4f6b3cd1 100644
--- a/docs/contributing.html
+++ b/docs/contributing.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
diff --git a/docs/dht_extensions.html b/docs/dht_extensions.html
index a68a7dc03..7d39f5b9a 100644
--- a/docs/dht_extensions.html
+++ b/docs/dht_extensions.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title></title>
diff --git a/docs/examples.html b/docs/examples.html
index baf23b1f5..334980cc7 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/19
1000
99/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>libtorrent Examples</title>
diff --git a/docs/extension_protocol.html b/docs/extension_protocol.html
index 093f833f8..b411a28ed 100644
--- a/docs/extension_protocol.html
+++ b/docs/extension_protocol.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title></title>
diff --git a/docs/features.html b/docs/features.html
index 0f64ccdc8..e6aa9abc7 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
diff --git a/docs/index.html b/docs/index.html
index b57122c2e..171577bc8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title></title>
@@ -86,16 +99,7 @@ the library.</p>
 <div class="section" id="donate">
 <h2>Donate</h2>
 <p>Support the development of libtorrent</p>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-        <input type="hidden" name="cmd" value="_xclick">
-        <input type="hidden" name="business" value="arvid@cs.umu.se">
-        <input type="hidden" name="item_name" value="libtorrent">
-        <input type="hidden" name="return" value="http://libtorrent.sf.net">
-        <input type="hidden" name="currency_code" value="USD">
-        <input type="hidden" name="tax" value="0">
-        <input type="image" src="https://www.paypal.com/images/
1000
x-click-but04.gif"
-                border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
-</form></div>
+<a class="FlattrButton" style="display:none;" href="http://libtorrent.org"></a></div>
 <div class="section" id="feedback">
 <h2>Feedback</h2>
 <p>There's a <a class="reference external" href="http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss">mailing list</a>, general libtorrent discussion.</p>
diff --git a/docs/index.rst b/docs/index.rst
index 33b12110c..35f06da1b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -101,17 +101,7 @@ Support the development of libtorrent
 
 .. raw:: html
 	
-	<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-		<input type="hidden" name="cmd" value="_xclick">
-		<input type="hidden" name="business" value="arvid@cs.umu.se">
-		<input type="hidden" name="item_name" value="libtorrent">
-		<input type="hidden" name="return" value="http://libtorrent.sf.net">
-		<input type="hidden" name="currency_code" value="USD">
-		<input type="hidden" name="tax" value="0">
-		<input type="image" src="https://www.paypal.com/images/x-click-but04.gif"
-			border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
-	</form>
-
+	<a class="FlattrButton" style="display:none;" href="http://libtorrent.org"></a>
 
 
 Feedback
diff --git a/docs/libtorrent_plugins.html b/docs/libtorrent_plugins.html
index ab9586ab4..db2dc6b9e 100644
--- a/docs/libtorrent_plugins.html
+++ b/docs/libtorrent_plugins.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title></title>
diff --git a/docs/make_torrent.html b/docs/make_torrent.html
index bcbc843eb..e95bb26bb 100644
--- a/docs/make_torrent.html
+++ b/docs/make_torrent.html
@@ -2,6 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<script type="text/javascript">
+/* <![CDATA[ */
+    (function() {
+        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+        
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+        
+        t.parentNode.insertBefore(s, t);
+    })();
+/* ]]> */
+</script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>creating torrents</title>
@@ -44,17 +57,18 @@
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title first">Table of contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#overview" id="id3">overview</a></li>
-<li><a class="reference internal" href="#high-level-example" id="id4">high level example</a></li>
-<li><a class="reference internal" href="#add-files" id="id5">add_files</a></li>
-<li><a class="reference internal" href="#set-piece-hashes" id="id6">set_piece_hashes()</a></li>
-<li><a class="reference internal" href="#file-storage" id="id7">file_storage</a><ul>
-<li><a class="reference internal" href="#add-file" id="id8">add_file()</a></li>
-<li><a class="reference internal" href="#id1" id="id9">add_file</a></li>
+<li><a class="reference internal" href="#overview" id="id2">overview</a></li>
+
1000
<li><a class="reference internal" href="#high-level-example" id="id3">high level example</a></li>
+<li><a class="reference internal" href="#add-files" id="id4">add_files</a></li>
+<li><a class="reference internal" href="#set-piece-hashes" id="id5">set_piece_hashes()</a></li>
+<li><a class="reference internal" href="#file-storage" id="id6">file_storage</a><ul>
+<li><a class="reference internal" href="#add-file" id="id7">add_file()</a></li>
+<li><a class="reference internal" href="#hash-symlink-mtime-file-index" id="id8">hash() symlink() mtime() file_index()</a></li>
+<li><a class="reference internal" href="#file-base-set-file-base" id="id9">file_base() set_file_base()</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#create-torrent" id="id10">create_torrent</a><ul>
-<li><a class="reference internal" href="#id2" id="id11">create_torrent()</a></li>
+<li><a class="reference internal" href="#id1" id="id11">create_torrent()</a></li>
 <li><a class="reference internal" href="#generate" id="id12">generate()</a></li>
 <li><a class="reference internal" href="#set-comment" id="id13">set_comment()</a></li>
 <li><a class="reference internal" href="#set-creator" id="id14">set_creator()</a></li>
@@ -224,6 +238,13 @@ public:
         int piece_length() const;
         int piece_size(int index) const;
 
+        sha1_hash const&amp; hash(internal_file_entry const&amp; fe) const;
+        std::string const&amp; symlink(internal_file_entry const&amp; fe) const;
+        time_t mtime(internal_file_entry const&amp; fe) const;
+        int file_index(internal_file_entry const&amp; fe) const;
+        size_type file_base(internal_file_entry const&amp; fe) const;
+        void set_file_base(internal_file_entry const&amp; fe, size_type off);
+
         void set_name(std::string const&amp; n);
         void set_name(std::wstring const&amp; n);
         const std::string&amp; name() const;
@@ -236,8 +257,8 @@ public:
 <blockquote>
 <pre class="literal-block">
 void add_file(file_entry const&amp; e);
-void add_file(fs::path const&amp; p, size_type size, int flags = 0);
-void add_file(fs::wpath const&amp; p, size_type size, int flags = 0);
+void add_file(std::string const&amp; p, size_type size, int flags = 0);
+void add_file(std::wstring const&amp; p, size_type size, int flags = 0);
 </pre>
 </blockquote>
 <p>Adds a file to the file storage. The <tt class="docutils literal"><span class="pre">flags</span></tt> argument sets attributes on the file.
@@ -248,24 +269,53 @@ pad_file
 attribute_hidden
 attribute_executable
 </pre>
-</div>
-<div class="section" id="id1">
-<h2>add_file</h2>
-<blockquote>
-<pre class="literal-block">
-void add_file(file_entry const&amp; e);
-void add_file(fs::path const&amp; p, size_type size);
-</pre>
-</blockquote>
-<p>Adds a file to the file storage. If more files than one are added,
-certain restrictions to their paths apply. In a multi-file file
-storage (torrent), all files must share the same root directory.</p>
+<p>If more files than one are added, certain restrictions to their paths apply.
+In a multi-file file storage (torrent), all files must sha