diff --git a/ChangeLog.txt b/ChangeLog.txt
index 88513ab6..1c73526c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+1.x.x - 2016xxxx
+================
+
+Broker:
+- Fix TLS operation with websockets listeners and libwebsockts 2.x. Closes
+  #186.
+
+
 1.4.9 - 20160603
 ================
 
diff --git a/src/websockets.c b/src/websockets.c
index ee7c5a25..b548b47f 100644
--- a/src/websockets.c
+++ b/src/websockets.c
@@ -603,6 +603,9 @@ struct libwebsocket_context *mosq_websockets_init(struct _mqtt3_listener *listen
 #ifndef LWS_IS_OLD
 	info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
 #endif
+#if LWS_LIBRARY_VERSION_MAJOR>1
+	info.options |= LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT
+#endif
 
 	user = _mosquitto_calloc(1, sizeof(struct libws_mqtt_hack));
 	if(!user){