diff --git a/.gitmodules b/.gitmodules
index 2644de0..6c67223 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "lib/rapidjson"]
 	path = lib/rapidjson
 	url = https://github.com/miloyip/rapidjson.git
+[submodule "lib/asio"]
+	path = lib/asio
+	url = https://github.com/chriskohlhoff/asio.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e60282..f89cde5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SIO_INCLUDEDIR ${CMAKE_CURRENT_LIST_DIR})
 
 add_library(sioclient ${ALL_SRC})
 target_include_directories(sioclient PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src
+    ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include
     ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp
     ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
 )
@@ -42,6 +43,7 @@ find_package(OpenSSL)
 if(OPENSSL_FOUND)
 add_library(sioclient_tls ${ALL_SRC})
 target_include_directories(sioclient_tls PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src
+    ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include
     ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp
     ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
     ${OPENSSL_INCLUDE_DIR}
diff --git a/lib/asio b/lib/asio
new file mode 160000
index 0000000..2768460
--- /dev/null
+++ b/lib/asio
@@ -0,0 +1 @@
+Subproject commit 276846097ab5073b67e772dbdfa12596224a54a5
diff --git a/lib/websocketpp b/lib/websocketpp
index ac5d7ea..378437a 160000
--- a/lib/websocketpp
+++ b/lib/websocketpp
@@ -1 +1 @@
-Subproject commit ac5d7ea5af9734de965688b54a7860259887b537
+Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3
diff --git a/src/internal/sio_client_impl.h b/src/internal/sio_client_impl.h
index 9a7cb93..5e08909 100644
--- a/src/internal/sio_client_impl.h
+++ b/src/internal/sio_client_impl.h
@@ -182,7 +182,7 @@ namespace sio
         void clear_timers();
 
         #if SIO_TLS
-        typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+        typedef websocketpp::lib::shared_ptr<asio::ssl::context> context_ptr;
 
         context_ptr on_tls_init(connection_hdl con);
         #endif