diff --git a/subprojects/websocketpp/websocketpp/common/thread.hpp b/subprojects/websocketpp/websocketpp/common/thread.hpp
index 9cf959ce0..1b0472aa6 100644
--- a/subprojects/websocketpp/websocketpp/common/thread.hpp
+++ b/subprojects/websocketpp/websocketpp/common/thread.hpp
@@ -36,7 +36,7 @@
 #if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
     // MinGW by default does not support C++11 thread/mutex so even if the
     // internal check for C++11 passes, ignore it if we are on MinGW
-    #if (!defined(__MINGW32__) && !defined(__MINGW64__)) || __MINGW64_VERSION_MAJOR>=6
+    #if (!defined(__MINGW32__) && !defined(__MINGW64__))
         #ifndef _WEBSOCKETPP_CPP11_THREAD_
             #define _WEBSOCKETPP_CPP11_THREAD_
         #endif
diff --git a/subprojects/websocketpp/websocketpp/transport/asio/connection.hpp b/subprojects/websocketpp/websocketpp/transport/asio/connection.hpp
index 60f88a79f..57dda74a2 100644
--- a/subprojects/websocketpp/websocketpp/transport/asio/connection.hpp
+++ b/subprojects/websocketpp/websocketpp/transport/asio/connection.hpp
@@ -311,9 +311,10 @@ public:
      * needed.
      */
     timer_ptr set_timer(long duration, timer_handler callback) {
-        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-            lib::ref(*m_io_service),
-            lib::asio::milliseconds(duration)
+        timer_ptr new_timer(
+            new lib::asio::steady_timer(
+                *m_io_service,
+                lib::asio::milliseconds(duration))
         );
 
         if (config::enable_multithreading) {
@@ -461,8 +462,7 @@ protected:
         m_io_service = io_service;
 
         if (config::enable_multithreading) {
-            m_strand = lib::make_shared<lib::asio::io_service::strand>(
-                lib::ref(*io_service));
+            m_strand.reset(new lib::asio::io_service::strand(*io_service));
         }
 
         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
diff --git a/subprojects/websocketpp/websocketpp/transport/asio/endpoint.hpp b/subprojects/websocketpp/websocketpp/transport/asio/endpoint.hpp
index ddab2c742..94509adb3 100644
--- a/subprojects/websocketpp/websocketpp/transport/asio/endpoint.hpp
+++ b/subprojects/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -195,8 +195,7 @@ public:
 
         m_io_service = ptr;
         m_external_io_service = true;
-        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
+        m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
 
         m_state = READY;
         ec = lib::error_code();
@@ -688,9 +687,7 @@ public:
      * @since 0.3.0
      */
     void start_perpetual() {
-        m_work = lib::make_shared<lib::asio::io_service::work>(
-            lib::ref(*m_io_service)
-        );
+        m_work.reset(new lib::asio::io_service::work(*m_io_service));
     }
 
     /// Clears the endpoint's perpetual flag, allowing it to exit when empty
@@ -854,8 +851,7 @@ protected:
 
         // Create a resolver
         if (!m_resolver) {
-            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
+            m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
         }
 
         tcon->set_uri(u);
diff --git a/subprojects/websocketpp/websocketpp/transport/asio/security/none.hpp b/subprojects/websocketpp/websocketpp/transport/asio/security/none.hpp
index 5c8293dbe..6c7d35241 100644
--- a/subprojects/websocketpp/websocketpp/transport/asio/security/none.hpp
+++ b/subprojects/websocketpp/websocketpp/transport/asio/security/none.hpp
@@ -168,8 +168,7 @@ protected:
             return socket::make_error_code(socket::error::invalid_state);
         }
 
-        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
-            lib::ref(*service));
+        m_socket.reset(new lib::asio::ip::tcp::socket(*service));
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, *m_socket);
diff --git a/subprojects/websocketpp/websocketpp/transport/asio/security/tls.hpp b/subprojects/websocketpp/websocketpp/transport/asio/security/tls.hpp
index c76fd9aa1..04ac37903 100644
--- a/subprojects/websocketpp/websocketpp/transport/asio/security/tls.hpp
+++ b/subprojects/websocketpp/websocketpp/transport/asio/security/tls.hpp
@@ -193,8 +193,7 @@ protected:
         if (!m_context) {
             return socket::make_error_code(socket::error::invalid_tls_context);
         }
-        m_socket = lib::make_shared<socket_type>(
-            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
+        m_socket.reset(new socket_type(*service, *m_context));
 
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl, get_socket());
diff --git a/subprojects/websocketpp/websocketpp/version.hpp b/subprojects/websocketpp/websocketpp/version.hpp
index f701ab103..5766546f7 100644
--- a/subprojects/websocketpp/websocketpp/version.hpp
+++ b/subprojects/websocketpp/websocketpp/version.hpp
@@ -44,7 +44,7 @@ static int const major_version = 0;
 /// Library minor version number
 static int const minor_version = 8;
 /// Library patch version number
-static int const patch_version = 1;
+static int const patch_version = 2;
 /// Library pre-release flag
 /**
  * This is a textual flag indicating the type and number for pre-release
@@ -54,7 +54,7 @@ static int const patch_version = 1;
 static char const prerelease_flag[] = "";
 
 /// Default user agent string
-static char const user_agent[] = "WebSocket++/0.8.1";
+static char const user_agent[] = "WebSocket++/0.8.2";
 
 } // namespace websocketpp