diff --git a/.SRCINFO b/.SRCINFO
index 8761c8b..93a819f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 17.4.0_devel.98979.adfb9c5c7b
+	pkgver = 18.1.0_devel.100598.411aa8c322
 	pkgrel = 1
 	url = http://mesa3d.sourceforge.net
 	arch = x86_64
@@ -10,10 +10,7 @@ pkgbase = mesa-git
 	makedepends = llvm-svn
 	makedepends = libclc
 	makedepends = clang-svn
-	makedepends = glproto
-	makedepends = dri2proto
-	makedepends = dri3proto
-	makedepends = presentproto
+	makedepends = xorgproto
 	makedepends = libxml2
 	makedepends = libx11
 	makedepends = libvdpau
@@ -41,25 +38,23 @@ pkgbase = mesa-git
 	provides = vulkan-radeon
 	provides = libva-mesa-driver
 	provides = mesa-vdpau
-	provides = mesa-libgl
 	provides = vulkan-driver
 	provides = opencl-driver
 	provides = opengl-driver
-	provides = libtxc_dxtn
 	conflicts = mesa
 	conflicts = opencl-mesa
 	conflicts = vulkan-intel
 	conflicts = vulkan-radeon
 	conflicts = libva-mesa-driver
 	conflicts = mesa-vdpau
-	conflicts = mesa-libgl
-	conflicts = libtxc_dxtn
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa
 	source = LICENSE
 	source = glvnd-fix-gl-dot-pc.patch
+	source = r600-bug#105262-copy-over-the-export-mask.patch
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
 	sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
+	sha512sums = 07cec26e158b4d5e01714cfa20a95df24dd004546cfc6ed8300c483e386e641c6842f3d85b66f3291ad88b57990723f29714b181f6c3e6abb0e5cebe231fef7f
 
 pkgname = mesa-git
 
diff --git a/r600-bug#105262-copy-over-the-export-mask.patch b/r600-bug#105262-copy-over-the-export-mask.patch
new file mode 100644
index 0000000..4172d2c
--- /dev/null
+++ b/r600-bug#105262-copy-over-the-export-mask.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
+index 7f6da1a3ed..923817119f 100644
+--- a/src/gallium/drivers/r600/r600_state.c
++++ b/src/gallium/drivers/r600/r600_state.c
+@@ -2525,6 +2525,7 @@ void r600_update_ps_state(struct pipe_context *ctx, struct r600_pipe_shader *sha
+ 	}
+ 
+ 	shader->nr_ps_color_outputs = num_cout;
++	shader->ps_color_export_mask = rshader->ps_color_export_mask;
+ 
+ 	spi_ps_in_control_0 = S_0286CC_NUM_INTERP(rshader->ninput) |
+ 				S_0286CC_PERSP_GRADIENT_ENA(1)|