diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index e65fc37bab..9110e04e32 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -18,7 +18,7 @@ def setup():
                -Dplatforms=x11,wayland \
                -Ddri3=enabled \
                -Ddri-drivers=i915,i965,r100,r200,nouveau \
-               -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl \
+               -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl,zink \
                -Dgallium-extra-hud=true \
                -Dgallium-vdpau=enabled \
                -Dgallium-xvmc=enabled \
@@ -27,7 +27,6 @@ def setup():
                -Dgallium-nine=true \
                -Dvulkan-drivers=amd,intel \
                -Dvulkan-device-select-layer=true \
-               -Dvulkan-device-select-layer=true \
                -Dshared-glapi=enabled \
                -Dgles1=enabled \
                -Dgles2=enabled \
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index 4e1389d34c..f959e0c33a 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Mesa graphics libraries and utilities</Summary>
         <Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
-        <Archive sha1sum="9b4b80d39b1fc26aa234469d4b1e9a518be33fc5" type="tarxz">https://mesa.freedesktop.org/archive/mesa-20.2.3.tar.xz</Archive>
+        <Archive sha1sum="fba97064824a3645c5b00bd55618098483f21678" type="tarxz">https://mesa.freedesktop.org/archive/mesa-20.2.6.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>valgrind</Dependency>
@@ -43,7 +43,7 @@
             <Dependency>nettle-devel</Dependency>
             <Dependency>python3-mako</Dependency>
             <Dependency versionFrom="11.0.0">llvm</Dependency>
-            <Dependency versionFrom="11.0.0">lld-devel</Dependency>
+<!--             <Dependency versionFrom="11.0.0">lld-devel</Dependency> -->
             <Dependency versionFrom="11.0.0">llvm-clang-devel</Dependency>
             <Dependency versionFrom="1.2">libxshmfence-devel</Dependency>
             <Dependency>automake</Dependency>
@@ -95,11 +95,11 @@
             <Dependency>wayland-server</Dependency>
             <Dependency>libomxil-bellagio</Dependency>
             <Dependency>lm_sensors</Dependency>
-            <Dependency>libclc</Dependency>
+<!--             <Dependency>libclc</Dependency> -->
             <Dependency>vulkan</Dependency>
-            <Dependency>opencl-icd</Dependency>
+<!--             <Dependency>opencl-icd</Dependency> -->
             <Dependency versionFrom="11.0.0">llvm-libs</Dependency>
-            <Dependency versionFrom="11.0.0">llvm-clang</Dependency>
+<!--             <Dependency versionFrom="11.0.0">llvm-clang</Dependency> -->
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -116,6 +116,32 @@
             <AdditionalFile owner="root" permission="0644" target="/etc/drirc">drirc</AdditionalFile>
         </AdditionalFiles>
     </Package>
+    
+    <Package>
+        <Name>mesa-opencl</Name>
+        <Summary>OpenCL support for AMD/ATI Radeon mesa drivers</Summary>
+        <RuntimeDependencies>
+            <Dependency>zstd</Dependency>
+            <Dependency>zlib</Dependency>
+            <Dependency>expat</Dependency>
+            <Dependency>libdrm</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>elfutils</Dependency>
+            <Dependency>llvm-libs</Dependency>
+            <Dependency>libdrm-amd</Dependency>
+            <Dependency>llvm-clang</Dependency>
+            <Dependency>libdrm-radeon</Dependency>
+            <Dependency>libdrm-nouveau</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="config">/etc/OpenCL/vendors/mesa.icd</Path>
+            <Path fileType="library">/usr/lib/libMesaOpenCL.so*</Path>
+            <Path fileType="library">/usr/lib/gallium-pipe/pipe*.so</Path>
+        </Files>
+        <AdditionalFiles>
+<!--             <AdditionalFile owner="root" permission="0644" target="/etc/drirc">drirc</AdditionalFile> -->
+        </AdditionalFiles>
+    </Package>
 
     <Package>
         <Name>mesa-devel</Name>
@@ -215,13 +241,34 @@
     </Package>
 
     <History>
-        <Update release="34">
+        <Update release="37">
+            <Date>2020-12-17</Date>
+            <Version>20.2.6</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="36">
+            <Date>2020-12-10</Date>
+            <Version>20.2.4</Version>
+            <Comment>Version bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="35">
             <Date>2020-11-24</Date>
             <Version>20.2.3</Version>
             <Comment>Version bump</Comment>
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>
+        <Update release="34">
+            <Date>2020-11-12</Date>
+            <Version>20.2.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="33">
             <Date>2020-10-17</Date>
             <Version>20.2.1</Version>