diff --git a/www/yaws/Makefile b/www/yaws/Makefile
index 8b5174a70700..c84c31fc7833 100644
--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaws
-PORTVERSION=	1.86
+PORTVERSION=	1.87
 CATEGORIES=	www
 MASTER_SITES=	http://yaws.hyber.org/download/
 
diff --git a/www/yaws/distinfo b/www/yaws/distinfo
index a9c46b26b82a..b1e1d1f1f40b 100644
--- a/www/yaws/distinfo
+++ b/www/yaws/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaws-1.86.tar.gz) = 0bd5c0693796801fee26d9fc28de4f63
-SHA256 (yaws-1.86.tar.gz) = 63745fb97ffcb66db657e0c41a76b3705e84a3eb77f5b35017055eb36b13118c
-SIZE (yaws-1.86.tar.gz) = 859922
+MD5 (yaws-1.87.tar.gz) = cbc0011ff30022ce09f082a0338946f0
+SHA256 (yaws-1.87.tar.gz) = 45db7b758fcbda239b508da5402ad13d195e647bb92093e93d9ccf9a3c9dbaba
+SIZE (yaws-1.87.tar.gz) = 866526
diff --git a/www/yaws/pkg-plist b/www/yaws/pkg-plist
index d87da80d05fd..3671c4810360 100644
--- a/www/yaws/pkg-plist
+++ b/www/yaws/pkg-plist
@@ -40,6 +40,7 @@ bin/yaws
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_sup_restarts.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_ticker.beam
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_websockets.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_xmlrpc.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/ebin/yaws_zlib.beam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/include/erlsom.hrl
@@ -50,7 +51,6 @@ bin/yaws
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/envelope.xsd
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/epam
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib/setuid_drv.so
-%%WITH_SENDFILE%%%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib/yaws_sendfile_drv.so
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/mime.types
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/soap.xsd
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/wsdl.xsd
@@ -98,9 +98,12 @@ bin/yaws
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sup.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_sup_restarts.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_ticker.erl
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_vdir.erl
+%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_websockets.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_xmlrpc.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/yaws_zlib.erl
 %%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/src/ymnesia.erl
+%%WITH_SENDFILE%%%%LIB32DIR%%/erlang/lib/yaws-%%VERSION%%/priv/lib/yaws_sendfile_drv.so
 %%WWWDIR%%/END
 %%WWWDIR%%/END2
 %%WWWDIR%%/HEAD
@@ -313,6 +316,9 @@ bin/yaws
 %%WWWDIR%%/upload0.yaws
 %%WWWDIR%%/urandom.yaws
 %%WWWDIR%%/urandom_from_pid.yaws
+%%WWWDIR%%/websockets.yaws
+%%WWWDIR%%/websockets_example.yaws
+%%WWWDIR%%/websockets_example_endpoint.yaws
 %%WWWDIR%%/yapp_intro.yaws
 %%WWWDIR%%/yaws-1.55_to_1.56.patch
 %%WWWDIR%%/ybed.erl