diff --git a/Jamfile b/Jamfile
index 04473939f..d92a7cb53 100755
--- a/Jamfile
+++ b/Jamfile
@@ -173,13 +173,27 @@ rule linking ( properties * )
 		else
 		{
 			result += <library>/boost/system//boost_system/<link>shared ;
+
+			# when building a shared library with openssl, for some reason we really need
+			# boost date time (at least on windows). Hopefully a future version of asio
+			# will allow disabling this dependency
+			if <encryption>openssl in $(properties)
+			{
+				result += <library>/boost/date_time//boost_date_time/<link>shared ;
+			}
 		}
 		result += <include>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB ;
+
 	}
 	else
 	{
 		result += <library>boost_system ;
 
+		if <boost-link>shared in $(properties) && <encryption>openssl in $(properties)
+		{
+			result += <library>boost_date_time ;
+		}
+
 		# on mac the boost headers are installed in
 		# a directory that isn't automatically accessable
 		# on open indiana, boost is install at /usr/g++/include
@@ -411,11 +425,13 @@ local boost-library-search-path =
   ;
 
 lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-library-search-path) ;
-
 lib boost_system : : <target-os>solaris <name>boost_system $(boost-library-search-path) ;
-
 lib boost_system : : <name>boost_system ;
 
+lib boost_date_time : : <target-os>darwin <name>boost_date_time-mt $(boost-library-search-path) ;
+lib boost_date_time : : <target-os>solaris <name>boost_date_time $(boost-library-search-path) ;
+lib boost_date_time : : <name>boost_date_time ;
+
 # openssl on linux/bsd/macos etc.
 lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
 lib z : : <link>shared <name>z <search>/lib ;
diff --git a/src/asio.cpp b/src/asio.cpp
index fea57e283..249bc8882 100644
--- a/src/asio.cpp
+++ b/src/asio.cpp
@@ -51,7 +51,9 @@
 #include <boost/asio/detail/impl/strand_service.ipp>
 #include <boost/asio/detail/impl/task_io_service.ipp>
 #include <boost/asio/detail/impl/throw_error.ipp>
-//#include <boost/asio/detail/impl/timer_queue.ipp>
+#if defined TORRENT_USE_OPENSSL 
+#include <boost/asio/detail/impl/timer_queue_ptime.ipp>
+#endif
 #include <boost/asio/detail/impl/timer_queue_set.ipp>
 #include <boost/asio/detail/impl/win_iocp_handle_service.ipp>
 #include <boost/asio/detail/impl/win_iocp_io_service.ipp>