diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d99c51d..eab84a16 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,7 @@ else()
     aux_source_directory(libv4l2cpp/src LIBSRC_FILES)
     include_directories("libv4l2cpp/inc")
     add_library(libv4l2cpp STATIC ${LIBSRC_FILES})
-    target_link_libraries (${PROJECT_NAME} libv4l2cpp) 
+    target_link_libraries (${CMAKE_PROJECT_NAME} libv4l2cpp) 
 
     # webrtc
     add_definitions(-DWEBRTC_POSIX -fno-rtti)
@@ -218,10 +218,11 @@ else()
     endif()
     if (EXISTS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/obj/modules/desktop_capture/desktop_capture.ninja)
         add_definitions(-DUSE_X11)
-        target_link_libraries (${CMAKE_PROJECT_NAME} X11 Xext Xdamage Xfixes Xcomposite Xrandr Xtst)
+        find_package(X11)
+        target_link_libraries(${CMAKE_PROJECT_NAME} ${X11_LIBRARIES} ${X11_Xdamage_LIB} ${X11_Xfixes_LIB} ${X11_Xcomposite_LIB} ${X11_Xrandr_LIB} ${X11_Xtst_LIB})
     endif()
     # civetweb
-    target_link_libraries (${CMAKE_PROJECT_NAME} dl)
+    target_link_libraries(${CMAKE_PROJECT_NAME} dl)
     #alsa
     if (ALSA_FOUND)
         add_definitions(-DHAVE_SOUND)
diff --git a/html b/html
index 4ef0e82b..3a294f8b 160000
--- a/html
+++ b/html
@@ -1 +1 @@
-Subproject commit 4ef0e82ba5d6484d489bd10e0afbee62ebed2963
+Subproject commit 3a294f8b755f9ce8949acad58a655c1ccd0facf0