diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41a6e1df1..0e27f0f6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,9 @@ endif (NOT Boost_VERSION LESS 103500)
 include_directories(${Boost_INCLUDE_DIR})
 target_link_libraries(torrent-rasterbar ${Boost_LIBRARIES})
 
+# this works around a bug in asio in boost-1.39
+add_definitions(-DBOOST_ASIO_HASH_MAP_BUCKETS=1021)
+
 if (WIN32)
 	target_link_libraries(torrent-rasterbar wsock32 ws2_32)
 endif (WIN32)
diff --git a/Jamfile b/Jamfile
index 9eec8d22b..73922fd33 100755
--- a/Jamfile
+++ b/Jamfile
@@ -449,6 +449,8 @@ local usage-requirements =
 	<toolset>gcc:<cflags>-Wno-missing-braces
 	<boost>system:<cxxflags>$(CXXFLAGS)
 	<boost>system:<linkflags>$(LDFLAGS)
+# this works around a bug in asio in boost-1.39
+	<define>BOOST_ASIO_HASH_MAP_BUCKETS=1021
 	<tag>@tag
 	;
 
diff --git a/configure.in b/configure.in
index 94a13a8bc..433dd9987 100644
--- a/configure.in
+++ b/configure.in
@@ -172,7 +172,9 @@ AC_ARG_WITH(
 	[[logging=none]]
 )
 
-COMPILETIME_OPTIONS=""
+# this works around a bug in asio in boost-1.39
+COMPILETIME_OPTIONS="-DBOOST_ASIO_HASH_MAP_BUCKETS=1024"
+
 dnl Check the value for the --with-logging switch
 AC_MSG_CHECKING([what form of logging to use])
 case "$logging" in