diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index 2acabd85b..c75e2ff3c 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -172,6 +172,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_USE_LOCALE 0
 #define TORRENT_CLOSE_MAY_BLOCK 1
 #endif
+#else
+// FreeBSD has a reasonable iconv signature
+#define TORRENT_ICONV_ARG (const char**)
 #endif
 #define TORRENT_HAS_FALLOCATE 0
 #define TORRENT_USE_IFADDRS 1
diff --git a/src/asio.cpp b/src/asio.cpp
index 58f5fa796..aa5667db2 100644
--- a/src/asio.cpp
+++ b/src/asio.cpp
@@ -1,7 +1,7 @@
 // builds all boost.asio source as a separate compilation unit
 #include <boost/version.hpp>
 
-#if BOOST_VERSION >= 104610
+#if BOOST_VERSION >= 104500
 #include <boost/asio/impl/src.hpp>
 #endif