2 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index c63b98b18d..888883c6ba 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -216,6 +216,7 @@ EXTRA_DIST +=\
 libqpidcommon_la_LIBADD = \
   -lboost_program_options \
   -lboost_filesystem \
+  -lboost_thread-mt \
   -luuid \
   $(LIB_DLOPEN) \
   $(LIB_CLOCK_GETTIME)
diff --git a/cpp/src/qpid/Url.cpp b/cpp/src/qpid/Url.cpp
index 422939fdf4..22e81b3adc 100644
--- a/cpp/src/qpid/Url.cpp
+++ b/cpp/src/qpid/Url.cpp
@@ -23,6 +23,8 @@
 #include "qpid/sys/StrError.h"
 
 #include <limits.h>             // NB: must be before boost/spirit headers.
+#define BOOST_SPIRIT_THREADSAFE
+
 #include <boost/spirit.hpp>
 #include <boost/spirit/actor.hpp>
 
@@ -43,7 +45,7 @@ std::ostream& operator<<(std::ostream& os, const TcpAddress& a) {
 std::istream& operator>>(std::istream&, const TcpAddress&);
 
 Url Url::getHostNameUrl(uint16_t port) {
-    TcpAddress address("", port);
+    TcpAddress address(std::string(), port);
     if (!sys::SystemInfo::getLocalHostname(address))
         throw InvalidUrl(QPID_MSG("Cannot get host name: " << qpid::sys::strError(errno)));
     return Url(address);