diff --git a/docs/contributing.html b/docs/contributing.html
new file mode 100644
index 000000000..69ddea6f5
--- /dev/null
+++ b/docs/contributing.html
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!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>
+<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>
+<meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
+<link rel="stylesheet" type="text/css" href="../../css/base.css" />
+<link rel="stylesheet" type="text/css" href="../../css/rst.css" />
+<link rel="stylesheet" href="style.css" type="text/css" />
+<style type="text/css">
+/* Hides from IE-mac \*/
+* html pre { height: 1%; }
+/* End hide from IE-mac */
+</style>
+</head>
+<body>
+<div class="document" id="libtorrent-manual">
+    <div id="container">
+    <div id="headerNav">
+    <ul>
+    <li class="first"><a href="/">Home</a></li>
+    <li><a href="../../products.html">Products</a></li>
+    <li><a href="../../contact.html">Contact</a></li>
+    </ul>
+    </div>
+    <div id="header">
+    <h1><span>Rasterbar Software</span></h1>
+    <h2><span>Software developement and consulting</span></h2>
+    </div>
+    <div id="main">
+<h1 class="title">libtorrent manual</h1>
+<table class="docinfo" frame="void" rules="none">
+<col class="docinfo-name" />
+<col class="docinfo-content" />
+<tbody valign="top">
+<tr><th class="docinfo-name">Author:</th>
+<td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a></td></tr>
+<tr><th class="docinfo-name">Version:</th>
+<td>0.15.0</td></tr>
+</tbody>
+</table>
+<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="#contributing-to-libtorrent" id="id1">contributing to libtorrent</a></li>
+</ul>
+</div>
+<div class="section" id="contributing-to-libtorrent">
+<h1>contributing to libtorrent</h1>
+<p>There are several ways to contribute to libtorrent at various levels. Any help is
+much appreciated. If you're interested in something libtorrent related that's not
+enumerated on this page, please contact <a class="reference external" href="mailto:arvid&#64;rasterbar.com">arvid&#64;rasterbar.com</a> or the <a class="reference external" href="http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss">mailing list</a>.</p>
+<ol class="arabic">
+<li><dl class="first docutils">
+<dt>Testing</dt>
+<dd><p class="first last">This is not just limited to finding bugs and ways to reproduce crashes, but also
+sub-optimal behavior is certain scenarios and finding ways to reproduce those. Please
+report any issue to the bug tracker at <a class="reference external" href="http://code.google.com/p/libtorrent/issues/entry">google code</a>.</p>
+</dd>
+</dl>
+</li>
+</ol>
+<ol class="arabic" start="2">
+<li><dl class="first docutils">
+<dt>Documentation</dt>
+<dd><p class="first last">Finding typos or outdated sections in the documentation. Contributing documentation
+based on your own experience and experimentation with the library or with BitTorrent
+in general. Non-reference documentation is very much welcome as well, higher level
+descriptions on how to configure libtorrent for various situations for instance.</p>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt>Code</dt>
+<dd><p class="first last">Contributing code for new features or bug-fixes is highly welcome. If you're interested
+in adding a feature but not sure where to start, please contact the <a class="reference external" href="http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss">mailing list</a> or
+<tt class="docutils literal"><span class="pre">#libtorrent</span></tt> &#64; <tt class="docutils literal"><span class="pre">irc.freenode.net</span></tt>.</p>
+</dd>
+</dl>
+</li>
+</ol>
+</div>
+    </div>
+    <div id="footer">
+    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    </div>
+    </div>
+    <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+    </script>
+    <script type="text/javascript">
+    _uacct = "UA-1599045-1";
+    urchinTracker();
+    </script>
+</div>
+</body>
+</html>
diff --git a/docs/contributing.rst b/docs/contributing.rst
new file mode 100644
index 000000000..28a2d51c5
--- /dev/null
+++ b/docs/contributing.rst
@@ -0,0 +1,38 @@
+=================
+libtorrent manual
+=================
+
+:Author: Arvid Norberg, arvid@rasterbar.com
+:Version: 0.15.0
+
+.. contents:: Table of contents
+  :depth: 2
+  :backlinks: none
+
+contributing to libtorrent
+==========================
+
+There are several ways to contribute to libtorrent at various levels. Any help is
+much appreciated. If you're interested in something libtorrent related that's not
+enumerated on this page, please contact arvid@rasterbar.com or the `mailing list`_.
+
+.. _`mailing list`: http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss
+
+1. Testing
+	This is not just limited to finding bugs and ways to reproduce crashes, but also
+	sub-optimal behavior is certain scenarios and finding ways to reproduce those. Please
+	report any issue to the bug tracker at `google code`_.
+
+.. _`google code`: http://code.google.com/p/libtorrent/issues/entry
+
+2. Documentation
+	Finding typos or outdated sections in the documentation. Contributing documentation
+	based on your own experience and experimentation with the library or with BitTorrent
+	in general. Non-reference documentation is very much welcome as well, higher level
+	descriptions on how to configure libtorrent for various situations for instance.
+
+3. Code
+	Contributing code for new features or bug-fixes is highly welcome. If you're interested
+	in adding a feature but not sure where to start, please contact the `mailing list`_ or
+	``#libtorrent`` @ ``irc.freenode.net``.
+
diff --git a/docs/index.html b/docs/index.html
index 79b38ddfc..9345b1518 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -34,6 +34,7 @@
 <div id="librarySidebar"><ul class="simple">
 <li><a class="reference external" href="http://code.google.com/p/libtorrent/downloads/list">download</a></li>
 <li><a class="reference external" href="features.html">features</a></li>
+<li><a class="reference external" href="contributing.html">contributing</a></li>
 <li><a class="reference external" href="building.html">building libtorrent</a></li>
 <li><a class="reference external" href="examples.html">examples</a></li>
 <li><a class="reference external" href="manual.html">api documentation</a></li>
diff --git a/docs/index.rst b/docs/index.rst
index b1687a796..087694207 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,6 +4,7 @@
 
 * download_
 * features_
+* contributing_
 * `building libtorrent`_
 * examples_
 * `api documentation`_
@@ -50,6 +51,7 @@ libtorrent
 
 .. _download: http://code.google.com/p/libtorrent/downloads/list
 .. _features: features.html
+.. _contributing: contributing.html
 .. _`building libtorrent`: building.html
 .. _examples: examples.html
 .. _`api documentation`: manual.html
diff --git a/docs/makefile b/docs/makefile
index 39c55472f..e43162f25 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -8,6 +8,7 @@ TARGETS = index \
 	manual \
 	building \
 	features \
+	contributing\
 	examples \
 	extension_protocol \
 	make_torrent \
diff --git a/set_version.py b/set_version.py
index fe1235b6b..ddef408d7 100644
--- a/set_version.py
+++ b/set_version.py
@@ -36,6 +36,7 @@ substitute_file('configure.ac')
 substitute_file('docs/manual.rst')
 substitute_file('docs/building.rst')
 substitute_file('docs/features.rst')
+substitute_file('docs/contributing.rst')
 substitute_file('docs/tuning.rst')
 substitute_file('Jamfile')
 
