diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index ab63b5e895e..94be280a93f 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,6 +1,6 @@
 # Template file for 'libGL'
 pkgname=libGL
-version=18.2.6
+version=18.3.0
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -10,7 +10,7 @@ configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true
  -Dplatforms=x11,drm,wayland,surfaceless -Dllvm=true
  -Db_lto=false"
 hostmakedepends="flex libxml2-python llvm pkg-config
- python-Mako wayland-protocols wayland-devel"
+ python3-Mako wayland-protocols wayland-devel"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel
@@ -21,11 +21,10 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://www.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=9ebafa4f8249df0c718e93b9ca155e3593a1239af303aa2a8b0f2056a7efdc12
-conf_files="/etc/drirc"
+checksum=b63f947e735d6ef3dfaa30c789a9adfbae18aea671191eaacde95a18c17fc38a
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl"
+subpackages="libglapi libgbm libEGL libGLES libOSMesa"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
@@ -94,21 +93,21 @@ libglapi_package() {
 	depends="libudev"
 	short_desc="Free implementation of the GL API - shared library"
 	pkg_install() {
-		vmove "usr/lib/libglapi.so*"
+		vmove "usr/lib/libglapi.so.*"
 	}
 }
 
 libgbm_package() {
 	short_desc="Mesa Generic buffer management API - runtime"
 	pkg_install() {
-		vmove "usr/lib/libgbm.so*"
+		vmove "usr/lib/libgbm.so.*"
 	}
 }
 
 libEGL_package() {
 	short_desc="Free implementation of the EGL API - runtime"
 	pkg_install() {
-		vmove "usr/lib/libEGL*.so*"
+		vmove "usr/lib/libEGL*.so.*"
 	}
 }
 
@@ -116,24 +115,17 @@ libGLES_package() {
 	depends="libudev"
 	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
 	pkg_install() {
-		vmove "usr/lib/libGLES*.so*"
+		vmove "usr/lib/libGLES*.so.*"
 	}
 }
 
 libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
 	pkg_install() {
-		vmove "usr/lib/libOSMesa.so*"
+		vmove "usr/lib/libOSMesa.so.*"
 	}
 }
 
-libwayland-egl_package() {
-	short_desc="Wayland EGL api transitional dummy package"
-	depends="wayland>=1.15.0_4"
-	build_style=meta
-	noarch=yes
-}
-
 MesaLib-devel_package() {
 	depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
 	 libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
@@ -147,20 +139,21 @@ MesaLib-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }
 
 libxatracker_package() {
 	short_desc="Mesa XA tracker interface library"
 	pkg_install() {
-		vmove "usr/lib/libxatracker*.so*"
+		vmove "usr/lib/libxatracker*.so.*"
 	}
 }
 
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
 	pkg_install() {
-		vmove "usr/lib/libXvMCr[36]00.so*"
+		vmove "usr/lib/libXvMCr[36]00.so.*"
 		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
 		vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
 		vmove "usr/lib/xorg/modules/drivers/radeon*"
@@ -185,7 +178,7 @@ mesa-intel-dri_package() {
 mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
 	pkg_install() {
-		vmove "usr/lib/libXvMCnouveau.so*"
+		vmove "usr/lib/libXvMCnouveau.so.*"
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
 		vmove "usr/lib/xorg/modules/drivers/nouveau*"
 		vmove "usr/lib/dri/nouveau*"
@@ -216,7 +209,7 @@ mesa-opencl_package() {
 	depends="libclc libOpenCL"
 	pkg_install() {
 		vmove etc/OpenCL
-		vmove "usr/lib/lib*OpenCL*"
+		vmove "usr/lib/libMesaOpenCL*"
 	}
 }
 
diff --git a/srcpkgs/libwayland-egl b/srcpkgs/libwayland-egl
deleted file mode 120000
index 5ef01dc565e..00000000000
--- a/srcpkgs/libwayland-egl
+++ /dev/null
@@ -1 +0,0 @@
-libGL
\ No newline at end of file