diff --git a/src/cpp/ripple/WSDoor.h b/src/cpp/ripple/WSDoor.h
index 24ba138a8..bdac87ea7 100644
--- a/src/cpp/ripple/WSDoor.h
+++ b/src/cpp/ripple/WSDoor.h
@@ -12,7 +12,7 @@
 namespace websocketpp
 {
 	class server;
-	class server_tls;
+	class server_autotls;
 }
 
 #endif
@@ -20,19 +20,18 @@ namespace websocketpp
 class WSDoor
 {
 private:
-	websocketpp::server*		mEndpoint;
-	websocketpp::server_tls*	mSEndpoint;
+	websocketpp::server_autotls*	mSEndpoint;
 
-	boost::thread*				mThread;
-	bool						mPublic;
-	std::string					mIp;
-	int							mPort;
+	boost::thread*					mThread;
+	bool							mPublic;
+	std::string						mIp;
+	int								mPort;
 
 	void		startListening();
 
 public:
 
-	WSDoor(const std::string& strIp, int iPort, bool bPublic) : mEndpoint(0), mSEndpoint(0), mThread(0), mPublic(bPublic), mIp(strIp), mPort(iPort) { ; }
+	WSDoor(const std::string& strIp, int iPort, bool bPublic) : mSEndpoint(0), mThread(0), mPublic(bPublic), mIp(strIp), mPort(iPort) { ; }
 
 	void		stop();
 
diff --git a/src/cpp/ripple/WSHandler.h b/src/cpp/ripple/WSHandler.h
index 793ca98b8..4324e7bfc 100644
--- a/src/cpp/ripple/WSHandler.h
+++ b/src/cpp/ripple/WSHandler.h
@@ -37,7 +37,7 @@ protected:
 public:
 	WSServerHandler(boost::shared_ptr<boost::asio::ssl::context> spCtx, bool bPublic) : mCtx(spCtx), mPublic(bPublic)
 	{
-		if (theConfig.WEBSOCKET_SECURE)
+		if (theConfig.WEBSOCKET_SECURE != 0)
 		{
 			initSSLContext(*mCtx, theConfig.WEBSOCKET_SSL_KEY,
 				theConfig.WEBSOCKET_SSL_CERT, theConfig.WEBSOCKET_SSL_CHAIN);