diff --git a/package/odroid-mali/Config.in b/package/odroid-mali/Config.in
index 2cd8e0d3e6..e5c07f2378 100644
--- a/package/odroid-mali/Config.in
+++ b/package/odroid-mali/Config.in
@@ -20,6 +20,15 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
 
 endif
 
+config BR2_PACKAGE_ODROID_MALI_X11
+	bool
+	depends on BR2_aarch64 # No 32 bit version available
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+
 comment "odroid-mali needs a glibc toolchain"
 	depends on BR2_aarch64 || BR2_ARM_EABIHF
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/odroid-mali/odroid-mali.mk b/package/odroid-mali/odroid-mali.mk
index 7b8e5110df..142fd97c67 100644
--- a/package/odroid-mali/odroid-mali.mk
+++ b/package/odroid-mali/odroid-mali.mk
@@ -12,21 +12,32 @@ ODROID_MALI_LICENSE_FILES = README.md
 ODROID_MALI_INSTALL_STAGING = YES
 ODROID_MALI_PROVIDES = libegl libgles
 
-ifeq ($(BR2_aarch64),y)
-ODROID_MALI_INSTALL_ARCH = mali_libs
+ifeq ($(BR2_PACKAGE_ODROID_MALI_X11),y)
+ODROID_MALI_HEADERS_SUBDIR = x11/mali_headers/
+ODROID_MALI_LIBS_SUBDIR = x11/mali_libs/
+# The X11 blobs are linked against those libraries, and the headers
+# include headers from those libraries
+ODROID_MALI_DEPENDENCIES += \
+	libdrm xlib_libX11 xlib_libXdamage \
+	xlib_libXext xlib_libXfixes
 else
-ODROID_MALI_INSTALL_ARCH = 32bit_libs
+ODROID_MALI_HEADERS_SUBDIR = fbdev/mali_headers/
+ifeq ($(BR2_aarch64),y)
+ODROID_MALI_LIBS_SUBDIR = fbdev/mali_libs/
+else
+ODROID_MALI_LIBS_SUBDIR = fbdev/32bit_libs/
+endif
 endif
 
 define ODROID_MALI_INSTALL_LIBS
-	cp -dpfr $(@D)/fbdev/$(ODROID_MALI_INSTALL_ARCH)/lib* $(1)/usr/lib/
+	cp -dpfr $(@D)/$(ODROID_MALI_LIBS_SUBDIR)/lib* $(1)/usr/lib/
 endef
 
 define ODROID_MALI_INSTALL_STAGING_CMDS
 	$(call ODROID_MALI_INSTALL_LIBS,$(STAGING_DIR))
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
 	cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-	cp -dpfr $(@D)/fbdev/mali_headers/* $(STAGING_DIR)/usr/include
+	cp -dpfr $(@D)/$(ODROID_MALI_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include
 endef
 
 define ODROID_MALI_INSTALL_TARGET_CMDS