diff --git a/ChangeLog b/ChangeLog
index 8cfc868bf..981dc66bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
+release 0.11
+
 	* added support for incorrectly encoded paths in torrent files
 	  (assumes Latin-1 encoding and converts to UTF-8).
+	* added support for destructing session objects asynchronously.
 	* fixed bug with file_progress() with files = 0 bytes
 	* fixed a race condition bug in udp_tracker_connection that could
 	  cause a crash.
diff --git a/docs/manual.html b/docs/manual.html
index 5b2198004..e1dce8768 100755
--- a/docs/manual.html
+++ b/docs/manual.html
@@ -957,7 +957,7 @@ struct file_entry
         boost::filesystem::path path;
         size_type offset;
         size_type size;
-        boost::scoped_ptr<boost::filesystem::path> orig_path;
+        boost::shared_ptr<const boost::filesystem::path> orig_path;
 };
 </pre>
 </div>
diff --git a/docs/manual.rst b/docs/manual.rst
index 839100f4c..9967d07ef 100755
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -870,7 +870,7 @@ info-hash.
 		boost::filesystem::path path;
 		size_type offset;
 		size_type size;
-		boost::shared_ptr<boost::filesystem::path> orig_path;
+		boost::shared_ptr<const boost::filesystem::path> orig_path;
 	};
 
 
diff --git a/include/libtorrent/torrent_info.hpp b/include/libtorrent/torrent_info.hpp
index 43de675f9..4e6e20d9e 100755
--- a/include/libtorrent/torrent_info.hpp
+++ b/include/libtorrent/torrent_info.hpp
@@ -70,7 +70,7 @@ namespace libtorrent
 		// the origianal corrupt encoded string. It is
 		// preserved in order to be able to reproduce
 		// the correct info-hash
-		boost::shared_ptr<boost::filesystem::path> orig_path;
+		boost::shared_ptr<const boost::filesystem::path> orig_path;
 	};
 
 	struct TORRENT_EXPORT file_slice