diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index f06e8a307d..09b28e6a01 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -51,7 +51,7 @@ def setup():
 
     elif get.ARCH() == "x86_64":
         options += " --with-clang-libdir=/usr/lib \
-                            --enable-omx \
+                            --enable-omx-bellagio \
                             --enable-opencl-icd "
 
     autotools.configure(options)
@@ -67,7 +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*")
         return
 
     #pisitools.dodoc("docs/COPYING")
     pisitools.dohtml("docs/*")
+    
+    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 c665122723..f90e14c4a2 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -13,8 +13,9 @@
         <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="b5527aefe1a783f023f7e0c6e7cb87a837f54749" type="tarxz">ftp://ftp.freedesktop.org/pub/mesa/older-versions/13.x/13.0.4/mesa-13.0.4.tar.xz</Archive>
+        <Archive sha1sum="bb9be653a26d89f3b6c4c00c64f4a5896d9d7f38" type="tarxz">https://mesa.freedesktop.org/archive/mesa-17.3.4.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>zlib-devel</Dependency>
             <Dependency>xorg-proto</Dependency>
             <Dependency>openssl-devel</Dependency>
             <Dependency>expat-devel</Dependency>
@@ -34,26 +35,28 @@
             <Dependency>eudev-devel</Dependency>
             <Dependency>nettle-devel</Dependency>
             <Dependency>python-mako</Dependency>
-            <Dependency versionFrom="3.8.0">llvm</Dependency>
-            <Dependency versionFrom="3.8.0">llvm-libs</Dependency>
-            <Dependency versionFrom="3.8.0">llvm-clang-devel</Dependency>
+            <Dependency versionFrom="5.0.1">llvm</Dependency>
+            <Dependency versionFrom="5.0.1">llvm-libs</Dependency>
+            <Dependency versionFrom="5.0.1">llvm-clang-devel</Dependency>
             <Dependency versionFrom="1.2">libxshmfence-devel</Dependency>
             <Dependency>automake</Dependency>
+            <Dependency>wayland-protocols-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch</Patch>
-            <Patch level="1">n_Define-GLAPIVAR-separate-from-GLAPI.patch</Patch>
-            <Patch level="1">N_01-WIP-nouveau-add-locking.patch</Patch>
-            <Patch level="1">N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch</Patch>
-            <Patch level="1">N_03-nv30-locking-fixes.patch</Patch>
-            <Patch level="1">N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch</Patch>
-            <Patch level="1">N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch</Patch>
+<!--             <Patch level="1">n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch</Patch> -->
+<!--             <Patch level="1">n_Define-GLAPIVAR-separate-from-GLAPI.patch</Patch> -->
+<!--             <Patch level="1">N_01-WIP-nouveau-add-locking.patch</Patch> -->
+<!--             <Patch level="1">N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch</Patch> -->
+<!--             <Patch level="1">N_03-nv30-locking-fixes.patch</Patch> -->
+<!--             <Patch level="1">N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch</Patch> -->
+<!--             <Patch level="1">N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch</Patch> -->
         </Patches>
     </Source>
 
     <Package>
         <Name>mesa</Name>
         <RuntimeDependencies>
+            <Dependency>zlib</Dependency>
             <Dependency>elfutils</Dependency>
             <Dependency>libdrm-amd</Dependency>
             <Dependency>alternatives</Dependency>
@@ -76,9 +79,9 @@
             <Dependency>libomxil-bellagio</Dependency>
             <Dependency>nettle</Dependency>
             <Dependency versionFrom="1.2">libxshmfence</Dependency>
-            <Dependency versionFrom="3.8.0">llvm</Dependency>
-            <Dependency versionFrom="3.8.0">llvm-clang</Dependency>
-            <Dependency versionFrom="3.8.0">llvm-libs</Dependency>
+            <Dependency versionFrom="5.0.1">llvm</Dependency>
+            <Dependency versionFrom="5.0.1">llvm-clang</Dependency>
+            <Dependency versionFrom="5.0.1">llvm-libs</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -124,6 +127,7 @@
         <Summary>32-bit shared libraries for mesa</Summary>
         <BuildType>emul32</BuildType>
         <BuildDependencies>
+            <Dependency>zlib-32bit</Dependency>
             <Dependency>elfutils-32bit</Dependency>
             <Dependency>expat-32bit</Dependency>
             <Dependency>libXt-devel</Dependency>
@@ -146,9 +150,10 @@
             <Dependency>libdrm-nouveau-32bit</Dependency>
             <Dependency>libxshmfence-32bit</Dependency>
             <Dependency>nettle-32bit</Dependency>
-            <Dependency versionFrom="3.8.0">llvm-32bit</Dependency>
+            <Dependency versionFrom="5.0.1">llvm-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
+            <Dependency>zlib-32bit</Dependency>
             <Dependency>elfutils-32bit</Dependency>
             <Dependency>openssl-32bit</Dependency>
             <Dependency>alternatives</Dependency>
@@ -171,7 +176,7 @@
             <Dependency>libdrm-nouveau-32bit</Dependency>
             <Dependency>wayland-32bit</Dependency>
             <Dependency release="current">mesa</Dependency>
-            <Dependency versionFrom="3.8.0">llvm-32bit</Dependency>
+            <Dependency versionFrom="5.0.1">llvm-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32</Path>
@@ -182,6 +187,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2018-07-26</Date>
+            <Version>17.3.4</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2018-04-10</Date>
             <Version>13.0.4</Version>