diff --git a/alarm/odroid-c2-libgl/PKGBUILD b/alarm/odroid-c2-libgl/PKGBUILD
index 1cdb5e623..7d5e61dcb 100644
--- a/alarm/odroid-c2-libgl/PKGBUILD
+++ b/alarm/odroid-c2-libgl/PKGBUILD
@@ -4,10 +4,10 @@
 buildarch=8
 
 pkgbase=odroid-c2-libgl
-pkgname=("${pkgbase}-fb")
-pkgver=r5p1
+pkgname=("${pkgbase}-x11" "${pkgbase}-fb" "${pkgbase}-headers")
+pkgver=r6p1
 pkgrel=1
-_commit=228b2e75bea3426661437d5642fbae3a376895fd
+_commit=46fe49f37e3506c6205ad8c50980eca9bfff11e3
 arch=('aarch64')
 url="http://www.hardkernel.com/"
 license=('Proprietary')
@@ -18,6 +18,17 @@ source=("git+https://github.com/mdrjr/c2_mali.git#commit=${_commit}"
 md5sums=('SKIP'
          '40f5104200cfceb12b4623d219646d4e')
 
+package_odroid-c2-libgl-x11() {
+  pkgdesc="ODROID-C2 Mali driver (X11)"
+  conflicts=('odroid-c2-libgl')
+  provides=('odroid-c2-libgl')
+
+  install -d "${pkgdir}"/usr/lib/mali-egl
+  install -d "${pkgdir}"/etc/ld.so.conf.d
+  cp -a c2_mali/x11/mali_libs/lib* "${pkgdir}"/usr/lib/mali-egl
+  cp "${srcdir}"/mali-c2.conf "${pkgdir}"/etc/ld.so.conf.d
+}
+
 package_odroid-c2-libgl-fb() {
   pkgdesc="ODROID-C2 Mali driver (framebuffer)"
   conflicts=('odroid-c2-libgl')
@@ -28,3 +39,10 @@ package_odroid-c2-libgl-fb() {
   cp -a c2_mali/fbdev/mali_libs/lib* "${pkgdir}"/usr/lib/mali-egl
   cp "${srcdir}"/mali-c2.conf "${pkgdir}"/etc/ld.so.conf.d
 }
+
+package_odroid-c2-libgl-headers() {
+  pkgdesc="ODROID-C2 Mali driver headers"
+
+  install -d "${pkgdir}"/usr/include
+  cp -a c2_mali/x11/mali_headers/{ump,umplock} "${pkgdir}"/usr/include
+}