diff --git a/packages/graphics/opengl-meson/package.mk b/packages/graphics/opengl-meson/package.mk
new file mode 100644
index 0000000000..836bfbfdae
--- /dev/null
+++ b/packages/graphics/opengl-meson/package.mk
@@ -0,0 +1,83 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="opengl-meson"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="nonfree"
+PKG_SITE="http://openlinux.amlogic.com:8000/download/ARM/filesystem/"
+case $MESON_FAMILY in
+  8)
+    PKG_VERSION="8-r5p1-01rel0-armhf"
+    ;;
+  6)
+    PKG_VERSION="6-r5p1-01rel0-armhf"
+    ;;
+esac
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="opengl-meson: OpenGL ES pre-compiled libraries for Mali GPUs found in Amlogic Meson SoCs"
+PKG_LONGDESC="opengl-meson: OpenGL ES pre-compiled libraries for Mali GPUs found in Amlogic Meson SoCs. The libraries could be found in a Linux buildroot released by Amlogic at http://openlinux.amlogic.com:8000/download/ARM/filesystem/. See the opengl package."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+ : # nothing todo
+}
+
+makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/include
+    cp -PR usr/include/* $SYSROOT_PREFIX/usr/include
+
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp -PR usr/lib/libMali.so $SYSROOT_PREFIX/usr/lib
+
+    ln -sf libMali.so $SYSROOT_PREFIX/usr/lib/libEGL.so.1.4
+    ln -sf libEGL.so.1.4 $SYSROOT_PREFIX/usr/lib/libEGL.so.1
+    ln -sf libEGL.so.1 $SYSROOT_PREFIX/usr/lib/libEGL.so
+
+    ln -sf libMali.so $SYSROOT_PREFIX/usr/lib/libGLESv1_CM.so.1.1
+    ln -sf libGLESv1_CM.so.1.1 $SYSROOT_PREFIX/usr/lib/libGLESv1_CM.so.1
+    ln -sf libGLESv1_CM.so.1 $SYSROOT_PREFIX/usr/lib/libGLESv1_CM.so
+
+    ln -sf libMali.so $SYSROOT_PREFIX/usr/lib/libGLESv2.so.2.0
+    ln -sf libGLESv2.so.2.0 $SYSROOT_PREFIX/usr/lib/libGLESv2.so.2
+    ln -sf libGLESv2.so.2 $SYSROOT_PREFIX/usr/lib/libGLESv2.so
+
+  mkdir -p $INSTALL/usr/lib
+    cp -PR usr/lib/libMali.so $INSTALL/usr/lib
+
+    ln -sf libMali.so $INSTALL/usr/lib/libEGL.so.1.4
+    ln -sf libEGL.so.1.4 $INSTALL/usr/lib/libEGL.so.1
+    ln -sf libEGL.so.1 $INSTALL/usr/lib/libEGL.so
+
+    ln -sf libMali.so $INSTALL/usr/lib/libGLESv1_CM.so.1.1
+    ln -sf libGLESv1_CM.so.1.1 $INSTALL/usr/lib/libGLESv1_CM.so.1
+    ln -sf libGLESv1_CM.so.1 $INSTALL/usr/lib/libGLESv1_CM.so
+
+    ln -sf libMali.so $INSTALL/usr/lib/libGLESv2.so.2.0
+    ln -sf libGLESv2.so.2.0 $INSTALL/usr/lib/libGLESv2.so.2
+    ln -sf libGLESv2.so.2 $INSTALL/usr/lib/libGLESv2.so
+}
+
+post_install() {
+  enable_service unbind-console.service
+}
diff --git a/packages/graphics/opengl-meson6/system.d/unbind-console.service b/packages/graphics/opengl-meson/system.d/unbind-console.service
similarity index 100%
rename from packages/graphics/opengl-meson6/system.d/unbind-console.service
rename to packages/graphics/opengl-meson/system.d/unbind-console.service
diff --git a/packages/graphics/opengl-meson6/package.mk b/packages/graphics/opengl-meson6/package.mk
deleted file mode 100644
index 44ab9038a5..0000000000
--- a/packages/graphics/opengl-meson6/package.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2014 Alex Deryskyba (alex@codesnake.com)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="opengl-meson6"
-PKG_VERSION="r5p1-01rel0-armhf"
-PKG_REV="1"
-PKG_ARCH="arm"
-PKG_LICENSE="nonfree"
-PKG_SITE="http://openlinux.amlogic.com:8000/download/ARM/filesystem/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="opengl-meson6: OpenGL ES pre-compiled libraries for Mali 400 GPUs found in Amlogic Meson6 SoCs"
-PKG_LONGDESC="opengl-meson6: OpenGL ES pre-compiled libraries for Mali 400 GPUs found in Amlogic Meson6 SoCs. The libraries could be found in a Linux buildroot released by Amlogic at http://openlinux.amlogic.com:8000/download/ARM/filesystem/. See the opengl package."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-make_target() {
- : # nothing todo
-}
-
-makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/include
-    cp -PR usr/include/* $SYSROOT_PREFIX/usr/include
-
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PR usr/lib/*.so* $SYSROOT_PREFIX/usr/lib
-
-  mkdir -p $INSTALL/usr/lib
-    cp -PR usr/lib/*.so* $INSTALL/usr/lib
-}
-
-post_install() {
-  enable_service unbind-console.service
-}
diff --git a/packages/graphics/opengl-meson8/package.mk b/packages/graphics/opengl-meson8/package.mk
deleted file mode 100644
index 74e7525007..0000000000
--- a/packages/graphics/opengl-meson8/package.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="opengl-meson8"
-PKG_VERSION="r5p1-01rel0-armhf"
-PKG_REV="1"
-PKG_ARCH="arm"
-PKG_LICENSE="nonfree"
-PKG_SITE="http://openlinux.amlogic.com:8000/download/ARM/filesystem/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="opengl-meson8: OpenGL ES pre-compiled libraries for Mali 450 GPUs found in Amlogic Meson8 SoCs"
-PKG_LONGDESC="opengl-meson8: OpenGL ES pre-compiled libraries for Mali 450 GPUs found in Amlogic Meson8 SoCs. The libraries could be found in a Linux buildroot released by Amlogic at http://openlinux.amlogic.com:8000/download/ARM/filesystem/. See the opengl package."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-make_target() {
- : # nothing todo
-}
-
-makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/include
-    cp -PR usr/include/* $SYSROOT_PREFIX/usr/include
-
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PR usr/lib/*.so* $SYSROOT_PREFIX/usr/lib
-
-  mkdir -p $INSTALL/usr/lib
-    cp -PR usr/lib/*.so* $INSTALL/usr/lib
-}
-
-post_install() {
-  enable_service unbind-console.service
-}
diff --git a/packages/graphics/opengl-meson8/system.d/unbind-console.service b/packages/graphics/opengl-meson8/system.d/unbind-console.service
deleted file mode 100644
index a79c37ad11..0000000000
--- a/packages/graphics/opengl-meson8/system.d/unbind-console.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Unbind framebuffer console
-
-ConditionPathExists=/sys/class/vtconsole/vtcon1/bind
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c 'echo 0 > /sys/class/vtconsole/vtcon1/bind'
-
-[Install]
-WantedBy=graphical.target
diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options
index 09f14f7f17..0efcdde22e 100644
--- a/projects/WeTek_Core/options
+++ b/projects/WeTek_Core/options
@@ -96,8 +96,11 @@
   # OpenGL(X) implementation to use (no / Mesa)
     OPENGL="no"
 
-  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson6)
-    OPENGLES="opengl-meson8"
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson)
+    OPENGLES="opengl-meson"
+
+  # Amlogic Meson SOC family (8 / 6)
+    MESON_FAMILY="8"
 
   # include uvesafb support (yes / no)
     UVESAFB_SUPPORT="no"
diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options
index 81d2c10433..384be25095 100644
--- a/projects/WeTek_Play/options
+++ b/projects/WeTek_Play/options
@@ -90,8 +90,11 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
-  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson6)
-    OPENGLES="opengl-meson6"
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson)
+    OPENGLES="opengl-meson"
+
+  # Amlogic Meson SOC family (8 / 6)
+    MESON_FAMILY="6"
 
   # include uvesafb support (yes / no)
     UVESAFB_SUPPORT="no"