diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in
index 06f4376453..281b55df7b 100644
--- a/package/libglfw/Config.in
+++ b/package/libglfw/Config.in
@@ -1,17 +1,18 @@
 config BR2_PACKAGE_LIBGLFW
 	bool "libglfw"
-	depends on BR2_PACKAGE_XORG7
-	depends on BR2_PACKAGE_HAS_LIBGL
-	select BR2_PACKAGE_XLIB_LIBXCURSOR
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XLIB_LIBXI
-	select BR2_PACKAGE_XLIB_LIBXINERAMA
-	select BR2_PACKAGE_XLIB_LIBXRANDR
+	depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND
+	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
+	select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
 	help
 	  GLFW is an Open Source, multi-platform library for creating
 	  windows with OpenGL contexts and receiving input and events.
 
 	  http://www.glfw.org
 
-comment "libglfw depends on X.org and needs an OpenGL backend"
-	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL
+comment "libglfw depends on X.org or Wayland and an OpenGL or GLES backend"
+	depends on !(BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND)
+	depends on !(BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES)
diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash
index c21a595bbc..5bffc55d26 100644
--- a/package/libglfw/libglfw.hash
+++ b/package/libglfw/libglfw.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537  libglfw-3.3.2.tar.gz
+sha256  ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02  libglfw-3.3.6.tar.gz
 sha256  149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462  LICENSE.md
diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk
index 63d2a88bf8..2ba31fd674 100644
--- a/package/libglfw/libglfw.mk
+++ b/package/libglfw/libglfw.mk
@@ -4,11 +4,9 @@
 #
 ################################################################################
 
-LIBGLFW_VERSION = 3.3.2
+LIBGLFW_VERSION = 3.3.6
 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION))
 LIBGLFW_INSTALL_STAGING = YES
-LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \
-	xlib_libXi xlib_libXinerama xlib_libXrandr
 LIBGLFW_LICENSE = Zlib
 LIBGLFW_LICENSE_FILES = LICENSE.md
 
@@ -17,6 +15,23 @@ LIBGLFW_CONF_OPTS += \
 	-DGLFW_BUILD_TESTS=OFF \
 	-DGLFW_BUILD_DOCS=OFF
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+LIBGLFW_DEPENDENCIES += xlib_libXcursor xlib_libXext \
+	xlib_libXi xlib_libXinerama xlib_libXrandr
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
+LIBGLFW_DEPENDENCIES += libgl
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
+LIBGLFW_DEPENDENCIES += libgles
+endif
+
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+LIBGLFW_CONF_OPTS +=  -DGLFW_USE_WAYLAND=1
+endif
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
 LIBGLFW_DEPENDENCIES += xlib_libXxf86vm
 endif