diff --git a/src/clientsession.cpp b/src/clientsession.cpp
index ff425c40..abf91407 100644
--- a/src/clientsession.cpp
+++ b/src/clientsession.cpp
@@ -36,7 +36,7 @@ ClientSession::ClientSession(const Config &config, boost::asio::io_service &io_s
     out_socket(io_service, ssl_context),
     status(HANDSHAKE) {}
 
-boost::asio::basic_socket<tcp, boost::asio::stream_socket_service<tcp> >& ClientSession::accept_socket() {
+tcp::socket& ClientSession::accept_socket() {
     return in_socket;
 }
 
diff --git a/src/clientsession.h b/src/clientsession.h
index ec3d8829..ad3dfe43 100644
--- a/src/clientsession.h
+++ b/src/clientsession.h
@@ -50,7 +50,7 @@ class ClientSession : public Session {
     void out_sent();
 public:
     ClientSession(const Config &config, boost::asio::io_service &io_service, boost::asio::ssl::context &ssl_context);
-    boost::asio::basic_socket<boost::asio::ip::tcp, boost::asio::stream_socket_service<boost::asio::ip::tcp> >& accept_socket();
+    boost::asio::ip::tcp::socket& accept_socket();
     void start();
 };
 
diff --git a/src/serversession.cpp b/src/serversession.cpp
index 6fa1cbc5..9c366d1a 100644
--- a/src/serversession.cpp
+++ b/src/serversession.cpp
@@ -34,8 +34,8 @@ ServerSession::ServerSession(const Config &config, boost::asio::io_service &io_s
     out_socket(io_service),
     status(HANDSHAKE) {}
 
-boost::asio::basic_socket<tcp, boost::asio::stream_socket_service<tcp> >& ServerSession::accept_socket() {
-    return in_socket.lowest_layer();
+tcp::socket& ServerSession::accept_socket() {
+    return (tcp::socket&)in_socket.lowest_layer();
 }
 
 void ServerSession::start() {
diff --git a/src/serversession.h b/src/serversession.h
index dda42794..44d2fad3 100644
--- a/src/serversession.h
+++ b/src/serversession.h
@@ -46,7 +46,7 @@ class ServerSession : public Session {
     void out_sent();
 public:
     ServerSession(const Config &config, boost::asio::io_service &io_service, boost::asio::ssl::context &ssl_context);
-    boost::asio::basic_socket<boost::asio::ip::tcp, boost::asio::stream_socket_service<boost::asio::ip::tcp> >& accept_socket();
+    boost::asio::ip::tcp::socket& accept_socket();
     void start();
 };
 
diff --git a/src/session.h b/src/session.h
index 72ca0720..b51df283 100644
--- a/src/session.h
+++ b/src/session.h
@@ -40,7 +40,7 @@ class Session : public std::enable_shared_from_this<Session> {
     boost::asio::ip::tcp::endpoint in_endpoint;
 public:
     Session(const Config &config, boost::asio::io_service &io_service);
-    virtual boost::asio::basic_socket<boost::asio::ip::tcp, boost::asio::stream_socket_service<boost::asio::ip::tcp> >& accept_socket() = 0;
+    virtual boost::asio::ip::tcp::socket& accept_socket() = 0;
     virtual void start() = 0;
 };
 
diff --git a/src/version.cpp b/src/version.cpp
index fe2052ed..b6c750b1 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -21,7 +21,7 @@
 #include <string>
 using namespace std;
 
-const string Version::version("0.6.0");
+const string Version::version("0.6.1");
 
 string Version::get_version() {
     return version;