diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index d566d17251..433cf8736e 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -41,15 +41,16 @@ def setup():
                -Dbuild-tests=false \
                -Dosmesa=gallium \
                -Dswr-arches=avx,avx2 \
+               -Dgallium-opencl=icd \
               " % ((libdir, ) * 2)
 
     if get.buildTYPE() == "emul32":
-        options += " -Dlmsensors=false"
+        options += " -Dlmsensors=false --native-file crossfile.ini -Dllvm_libdir=/usr/lib32"
         shelltools.export("CC", "gcc -m32")
         shelltools.export("CXX", "g++ -m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
         shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32") 
-    else: options += " -Dgallium-opencl=icd -Dgallium-omx=bellagio -Dlmsensors=true"
+    else: options += " -Dgallium-omx=bellagio -Dlmsensors=true"
 
     mesontools.configure(options)
 
diff --git a/x11/library/mesa/files/crossfile.ini b/x11/library/mesa/files/crossfile.ini
new file mode 100644
index 0000000000..63b8fc8a7e
--- /dev/null
+++ b/x11/library/mesa/files/crossfile.ini
@@ -0,0 +1,2 @@
+[binaries]
+llvm-config = '/usr/bin/llvm-config-32'
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index c248810c2a..8229411153 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="c3d603ec4857699fc93054351f24cfbd35818329" type="tarxz">https://mesa.freedesktop.org/archive/mesa-19.3.5.tar.xz</Archive>
+        <Archive sha1sum="c05cd6ab77577b0ce14642ab6cde295fba0256ef" type="tarxz">https://mesa.freedesktop.org/archive/mesa-20.0.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -55,6 +55,9 @@
             <Dependency>libclc-devel</Dependency>
             <Dependency>lm_sensors-devel</Dependency>
         </BuildDependencies>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
+        </AdditionalFiles>
         <Patches>
         </Patches>
     </Source>
@@ -164,6 +167,7 @@
             <Dependency>libXrandr-32bit</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
             <Dependency>vulkan-32bit</Dependency>
+            <Dependency>libclc-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>zlib-32bit</Dependency>
@@ -188,7 +192,9 @@
             <Dependency>libdrm-nouveau-32bit</Dependency>
             <Dependency>wayland-32bit</Dependency>
             <Dependency>vulkan-32bit</Dependency>
+            <Dependency>opencl-icd-32bit</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
+            <Dependency>libclc-32bit</Dependency>
             <Dependency>libunwind-32bit</Dependency>
             <Dependency release="current">mesa</Dependency>
             <Dependency versionFrom="8.0.0">llvm-32bit</Dependency>
@@ -200,19 +206,12 @@
     </Package>
 
     <History>
-        <Update release="20">
-            <Date>2020-03-10</Date>
-            <Version>19.3.5</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
         <Update release="19">
-            <Date>2020-01-11</Date>
-            <Version>19.3.2</Version>
+            <Date>2020-03-27</Date>
+            <Version>20.0.2</Version>
             <Comment>Version bump.</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
         </Update>
         <Update release="18">
             <Date>2020-01-03</Date>