diff --git a/src/network/uri/uri.hpp b/src/network/uri/uri.hpp
index ef136e0f..dc5205c8 100644
--- a/src/network/uri/uri.hpp
+++ b/src/network/uri/uri.hpp
@@ -16,6 +16,7 @@
 #include <iterator>
 #include <algorithm>
 #include <functional>
+#include <boost/lexical_cast.hpp>
 #include <boost/utility/string_ref.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/optional.hpp>
@@ -266,10 +267,9 @@ namespace network {
     boost::optional<IntT> port(typename std::is_integral<IntT>::type * = 0) const {
       if (auto p = port()) {
         try {
-          return static_cast<IntT>(
-              std::stoi(string_type(std::begin(*p), std::end(*p))));
+          return boost::lexical_cast<IntT>(string_type(std::begin(*p), std::end(*p)));
         }
-        catch (std::invalid_argument &) {
+        catch (boost::bad_lexical_cast &) {
           return boost::optional<IntT>();
         }
       }
diff --git a/src/network/uri/uri_builder.hpp b/src/network/uri/uri_builder.hpp
index c13e79de..dfaab4f0 100644
--- a/src/network/uri/uri_builder.hpp
+++ b/src/network/uri/uri_builder.hpp
@@ -71,7 +71,7 @@ namespace network {
     struct port_converter<T, typename std::enable_if<std::is_integral<typename std::decay<T>::type>::value>::type> {
 
       uri::string_type operator () (std::uint16_t port) const {
-	return std::to_string(port);
+	return boost::lexical_cast<uri::string_type>(port);
       }
 
     };