diff --git a/common/shlibs b/common/shlibs
index ba3cd4ce53e..296d1a97b92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2043,7 +2043,7 @@ libcvm-v1client.so.1 cvm-0.97_1
 libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.1 criu-1.5.1_2
-libwebsockets.so.7 libwebsockets-1.7.0_1
+libwebsockets.so.8 libwebsockets-2.0.0_1
 libbitcoinconsensus.so.0 litecoin-0.10.1.2_1
 libnfc.so.0 libnfc-1.7.1_1
 libfuzzy.so.2 libfuzzy-2.12_1
diff --git a/srcpkgs/libwebsockets/patches/fix-ipv6.patch b/srcpkgs/libwebsockets/patches/fix-ipv6.patch
new file mode 100644
index 00000000000..599ca549816
--- /dev/null
+++ b/srcpkgs/libwebsockets/patches/fix-ipv6.patch
@@ -0,0 +1,11 @@
+--- lib/server.c.orig	2016-05-05 22:02:19.415381744 +0200
++++ lib/server.c	2016-05-05 22:02:25.795382036 +0200
+@@ -67,7 +67,7 @@ lws_context_init_server(struct lws_conte
+ 	else
+ #endif
+ #ifdef LWS_USE_IPV6
+-	if (LWS_IPV6_ENABLED(context))
++	if (LWS_IPV6_ENABLED(vhost->context))
+ 		sockfd = socket(AF_INET6, SOCK_STREAM, 0);
+ 	else
+ #endif
diff --git a/srcpkgs/libwebsockets/patches/fix-libressl.patch b/srcpkgs/libwebsockets/patches/fix-libressl.patch
new file mode 100644
index 00000000000..ef8abfb4498
--- /dev/null
+++ b/srcpkgs/libwebsockets/patches/fix-libressl.patch
@@ -0,0 +1,24 @@
+--- lib/ssl.c.orig	2016-05-05 21:56:47.926366544 +0200
++++ lib/ssl.c	2016-05-05 21:56:11.400364869 +0200
+@@ -197,7 +197,9 @@ lws_ssl_destroy(struct lws_vhost *vhost)
+ #if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL)
+        ERR_remove_state(0);
+ #else
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100005L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) && \
++       !defined(LIBRESSL_VERSION_NUMBER) && \
++       !defined(OPENSSL_IS_BORINGSSL)
+        ERR_remove_thread_state();
+ #else
+        ERR_remove_thread_state(NULL);
+@@ -689,7 +691,9 @@ lws_ssl_context_destroy(struct lws_context *context)
+ #if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL)
+        ERR_remove_state(0);
+ #else
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100005L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) && \
++       !defined(LIBRESSL_VERSION_NUMBER) && \
++       !defined(OPENSSL_IS_BORINGSSL)
+        ERR_remove_thread_state();
+ #else
+        ERR_remove_thread_state(NULL);
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index 7c8eef7c8f3..45e9e2beb06 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,6 +1,6 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
-version=1.7.5
+version=2.0.0
 revision=1
 build_style=cmake
 hostmakedepends="cmake"
@@ -10,8 +10,8 @@ short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="LGPL-2"
 homepage="https://libwebsockets.org"
-distfiles="http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot/$pkgname-$version.tar.gz"
-checksum=e91f59fb6238462b4ffdfef2482239558b8a02198c9c6076eb3f86eb1c4e935d
+distfiles="https://github.com/warmcat/libwebsockets/archive/v$version.tar.gz"
+checksum=c2fa0f62caa9a82b2032af42f577e9079cc743889f02828a332211197ba43995
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {