diff --git a/Jamfile b/Jamfile
index 34146b25c..45a407dbe 100755
--- a/Jamfile
+++ b/Jamfile
@@ -108,13 +108,26 @@ rule linking ( properties * )
 
 	if <boost>source in $(properties)
 	{
-		result += <library>/boost/thread//boost_thread
-			<library>/boost/filesystem//boost_filesystem
-			<library>/boost/iostreams//boost_iostreams
-			<library>/boost/system//boost_system
-			<include>$(BOOST_ROOT)
-			<define>BOOST_ALL_NO_LIB
-			;
+		if <boost-link>static in $(properties)
+		{
+			result += <library>/boost/thread//boost_thread/<link>static
+				<library>/boost/filesystem//boost_filesystem/<link>static
+				<library>/boost/iostreams//boost_iostreams/<link>static
+				<library>/boost/system//boost_system/<link>static
+				<include>$(BOOST_ROOT)
+				<define>BOOST_ALL_NO_LIB
+				;
+		}
+		else
+		{
+			result += <library>/boost/thread//boost_thread/<link>shared
+				<library>/boost/filesystem//boost_filesystem/<link>shared
+				<library>/boost/iostreams//boost_iostreams/<link>shared
+				<library>/boost/system//boost_system/<link>shared
+				<include>$(BOOST_ROOT)
+				<define>BOOST_ALL_NO_LIB
+				;
+		}
 	}
 
 	if <boost>system in $(properties)
@@ -228,6 +241,7 @@ feature upnp-logging : off on : composite propagated link-incompatible ;
 feature.compose <upnp-logging>on : <define>TORRENT_UPNP_LOGGING ;
 
 feature boost : system source : link-incompatible propagated ;
+feature boost-link : static shared : composite ;
 
 feature debug-iterators : off on : composite propagated link-incompatible ;
 feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ;
diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile
index ec21998bb..068a0bee0 100755
--- a/bindings/python/Jamfile
+++ b/bindings/python/Jamfile
@@ -27,7 +27,8 @@ python-extension libtorrent
     src/ip_filter.cpp
   : <include>src
     <boost>system:<library>boost_python
-    <boost>source:<library>/boost/python//boost_python
-    <library>/torrent//torrent
+    <boost>source,<boost-link>static:<library>/boost/python//boost_python/<link>static
+    <boost>source,<boost-link>shared:<library>/boost/python//boost_python/<link>shared
+    <library>/torrent//torrent/<link>static
   ;
 
diff --git a/docs/building.rst b/docs/building.rst
index 0f47f4b88..01e21d3c4 100644
--- a/docs/building.rst
+++ b/docs/building.rst
@@ -226,6 +226,11 @@ Build features:
 |                        |   ``BOOST_ROOT`` must be defined to point to the   |
 |                        |   boost directory.                                 |
 +------------------------+----------------------------------------------------+
+| ``boost-link``         | * ``static`` - links statically against the boost  |
+|                        |   libraries.                                       |
+|                        | * ``shared`` - links dynamically against the boost |
+|                        |   libraries.                                       |
++------------------------+----------------------------------------------------+
 | ``logging``            | * ``none`` - no logging.                           |
 |                        | * ``default`` - basic session logging.             |
 |                        | * ``verbose`` - verbose peer wire logging.         |