diff --git a/Jamfile b/Jamfile
index df9dce7a7..116ccb0e3 100755
--- a/Jamfile
+++ b/Jamfile
@@ -209,9 +209,18 @@ rule linking ( properties * )
 	}
 	else
 	{
-		result += <library>boost_system ;
-		result += <library>boost_chrono ;
-		result += <library>boost_random ;
+		if <boost-link>static in $(properties)
+		{
+			result += <library>boost_system/<link>static ;
+			result += <library>boost_chrono/<link>static ;
+			result += <library>boost_random/<link>static ;
+		}
+		else
+		{
+			result += <library>boost_system/<link>shared ;
+			result += <library>boost_chrono/<link>shared ;
+			result += <library>boost_random/<link>shared ;
+		}
 
 		# on mac the boost headers are installed in
 		# a directory that isn't automatically accessable
@@ -475,9 +484,6 @@ feature.compose <character-set>unicode : <define>_UNICODE <define>UNICODE ;
 feature deprecated-functions : on off : composite propagated link-incompatible ;
 feature.compose <deprecated-functions>off : <define>TORRENT_NO_DEPRECATE ;
 
-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 : propagated composite ;
 
@@ -560,7 +566,6 @@ lib z : : <link>shared <name>z <search>/usr/lib ;
 lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z ;
 lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ;
 lib dl : : <link>shared <name>dl ;
-lib aio : : <link>shared <name>aio ;
 
 # time functions used on linux require librt
 lib librt : : <name>rt <link>shared ;
diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile
index 66a27b156..2932d3963 100755
--- a/bindings/python/Jamfile
+++ b/bindings/python/Jamfile
@@ -12,10 +12,11 @@ lib boost_python : : <name>boost_python ;
 feature visibility : default hidden : composite propagated link-incompatible ;
 feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ;
 
-feature libtorrent-link : static shared : ;
+feature libtorrent-link : shared static : composite propagated ;
 feature libtorrent-python-pic : off on : composite propagated link-incompatible ;
 feature.compose <libtorrent-python-pic>on : <cflags>-fPIC ;
 
+
 rule libtorrent_linking ( properties * )
 {
     local result ;
@@ -135,9 +136,8 @@ my-python-extension libtorrent
   : # requirements
     <include>src
     <conditional>@libtorrent_linking
-  : # default build
-    <boost-link>static
-    <libtorrent-link>static
+  : # usage-requirements
+    <conditional>@libtorrent_linking
     <suppress-import-lib>false
   ;