diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in
index e2b2e057d7..d63c47b324 100644
--- a/package/mesa3d-demos/Config.in
+++ b/package/mesa3d-demos/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_MESA3D_DEMOS
 	bool "mesa3d-demos"
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
 		|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
 	help
diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index 9b60dc9eb3..2db7f56cae 100644
--- a/package/mesa3d-demos/mesa3d-demos.mk
+++ b/package/mesa3d-demos/mesa3d-demos.mk
@@ -11,11 +11,11 @@ MESA3D_DEMOS_AUTORECONF = YES
 MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
-ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu
-MESA3D_DEMOS_CONF_OPTS += --enable-gl
+ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
+MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext
+MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
 else
-MESA3D_DEMOS_CONF_OPTS += --disable-gl
+MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)