diff --git a/ChangeLog.txt b/ChangeLog.txt
index e3d053b8..cf2b6ee8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -38,6 +38,7 @@ Broker:
   broker.
 - When using the include_dir configuration option sort the files
   alphabetically before loading them.  Closes #17.
+- IPv6 is no longer disabled for websockets listeners.
 
 Client library:
 - Outgoing messages with QoS>1 are no longer retried after a timeout period.
diff --git a/src/websockets.c b/src/websockets.c
index 188bbd56..28c7dc1a 100644
--- a/src/websockets.c
+++ b/src/websockets.c
@@ -621,7 +621,7 @@ struct libwebsocket_context *mosq_websockets_init(struct mosquitto__listener *li
 		info.options |= LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT;
 	}
 #endif
-	info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
+
 #if LWS_LIBRARY_VERSION_MAJOR>1
 	info.options |= LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
 #endif