diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in
index a3dce57271..904c805404 100644
--- a/package/libvncserver/Config.in
+++ b/package/libvncserver/Config.in
@@ -21,6 +21,11 @@ config BR2_PACKAGE_LIBVNCSERVER_TIGHTPNG
 
 	  http://wiki.qemu.org/VNC_Tight_PNG
 
+config BR2_PACKAGE_LIBVNCSERVER_WEBSOCKETS
+	bool "WebSockets support"
+	help
+	  Enable WebSocket support (e.g. for noVNC)
+
 endif
 
 comment "libvncserver needs a toolchain w/ dynamic library"
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index c6cbc834f6..9935a32dda 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -77,4 +77,17 @@ else
 LIBVNCSERVER_CONF_OPTS += -DWITH_ZLIB=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBVNCSERVER_WEBSOCKETS),y)
+HBT_LIBVNCSERVER_CONF_OPTS += -DWITH_WEBSOCKETS=ON
+
+define LIBVNCSERVER_INSTALL_VNC
+	$(INSTALL) -D -m 644 $(@D)/webclients/index.vnc \
+		$(TARGET_DIR)/usr/share/vnc/index.vnc
+endef
+
+LIBVNCSERVER_POST_INSTALL_TARGET_HOOKS += LIBVNCSERVER_INSTALL_VNC
+else
+LIBVNCSERVER_CONF_OPTS += -DWITH_WEBSOCKETS=OFF
+endif
+
 $(eval $(cmake-package))