diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index 4b6bca5ef8..b4eb97a4cf 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -19,7 +19,7 @@ def setup():
 
     options ="\
               --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-              --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \
+              --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
               --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
               --with-platforms=x11,drm,wayland \
               --enable-xa \
@@ -36,6 +36,7 @@ def setup():
               --enable-glx-tls \
               --enable-llvm \
               --enable-nine \
+              --enable-libunwind \
               --enable-llvm-shared-libs \
               --enable-shared-glapi \
               --enable-texture-float \
@@ -66,13 +67,13 @@ def install():
     pisitools.dosym("libGL.so.1.2.0", "%s/libGL.so.1.2" % Libdir)
 
     if get.buildTYPE() == "emul32":
-        pisitools.remove("/usr/lib32/pkgconfig/wayland-egl.pc")
-        pisitools.remove("/usr/lib32/libwayland-egl.so*")
+        #pisitools.remove("/usr/lib32/pkgconfig/wayland-egl.pc")
+        #pisitools.remove("/usr/lib32/libwayland-egl.so*")
         return
 
     #pisitools.dodoc("docs/COPYING")
     pisitools.dohtml("docs/*")
     
-    pisitools.remove("/usr/lib/libwayland-egl.so*")
-    pisitools.remove("/usr/lib/pkgconfig/wayland-egl.pc")
+    #pisitools.remove("/usr/lib/libwayland-egl.so*")
+    #pisitools.remove("/usr/lib/pkgconfig/wayland-egl.pc")
     
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index a8faa1dfb5..584769f8f7 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="8d4daf725f20404f980b981c9693b58756ba6c48" type="tarxz">https://mesa.freedesktop.org/archive/mesa-18.1.6.tar.xz</Archive>
+        <Archive sha1sum="1ada7d5fc5fabca63c78396b5afa587b94b9f2e0" type="tarxz">https://mesa.freedesktop.org/archive/mesa-18.2.5.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
             <Dependency>xorg-proto</Dependency>
@@ -42,6 +42,7 @@
             <Dependency>automake</Dependency>
             <Dependency>libunwind-devel</Dependency>
             <Dependency>wayland-protocols-devel</Dependency>
+            <Dependency>libXrandr-devel</Dependency>
         </BuildDependencies>
         <Patches>
 <!--             <Patch level="1">n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch</Patch> -->
@@ -154,6 +155,7 @@
             <Dependency>nettle-32bit</Dependency>
             <Dependency>libunwind-32bit</Dependency>
             <Dependency versionFrom="5.0.1">llvm-32bit</Dependency>
+            <Dependency>libXrandr-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>zlib-32bit</Dependency>
@@ -191,6 +193,13 @@
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2018-11-17</Date>
+            <Version>18.2.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2018-11-05</Date>
             <Version>18.1.6</Version>