diff --git a/.SRCINFO b/.SRCINFO
index d145047..e7e065f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 11.3.0_devel.81775.e79aa19
+	pkgver = 12.1.0_devel.82587.154c0a4
 	pkgrel = 1
 	url = http://mesa3d.sourceforge.net
 	arch = i686
@@ -33,11 +33,12 @@ pkgbase = mesa-git
 	makedepends = libxvmc
 	makedepends = vulkan-icd-loader
 	makedepends = libgcrypt
-	makedepends = libpthread-stubs
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master
 	source = LICENSE
+	source = remove-libpthread-stubs.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+	md5sums = e417399ed46be7f61da7246503965b13
 
 pkgname = opencl-mesa-git
 	pkgdesc = OpenCL support for AMD/ATI Radeon Mesa drivers
@@ -46,9 +47,9 @@ pkgname = opencl-mesa-git
 	depends = libcl
 	depends = libclc
 	depends = nettle
-	depends = mesa-git=11.3.0_devel.81775.e79aa19
+	depends = mesa-git=12.1.0_devel.82587.154c0a4
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-mesa=11.3.0-devel
+	provides = opencl-mesa=12.1.0-devel
 	conflicts = opencl-mesa
 	replaces = opencl-mesa
 
@@ -58,7 +59,7 @@ pkgname = mesa-vulkan-intel-git
 	depends = libgcrypt
 	depends = wayland
 	depends = libxcb
-	depends = mesa-git=11.3.0_devel.81775.e79aa19
+	depends = mesa-git=12.1.0_devel.82587.154c0a4
 	provides = vulkan-intel
 	conflicts = vulkan-intel
 	replaces = vulkan-intel
@@ -66,23 +67,23 @@ pkgname = mesa-vulkan-intel-git
 pkgname = libva-mesa-driver-git
 	pkgdesc = VA-API implementation for gallium
 	depends = nettle
-	depends = mesa-git=11.3.0_devel.81775.e79aa19
-	provides = libva-mesa-driver=11.3.0-devel
+	depends = mesa-git=12.1.0_devel.82587.154c0a4
+	provides = libva-mesa-driver=12.1.0-devel
 	conflicts = libva-mesa-driver
 
 pkgname = mesa-vdpau-git
 	pkgdesc = Mesa VDPAU drivers
 	depends = nettle
-	depends = mesa-git=11.3.0_devel.81775.e79aa19
-	provides = mesa-vdpau=11.3.0-devel
+	depends = mesa-git=12.1.0_devel.82587.154c0a4
+	provides = mesa-vdpau=12.1.0-devel
 	conflicts = mesa-vdpau
 	replaces = mesa-vdpau
 
 pkgname = mesa-libgl-git
 	pkgdesc = Mesa 3-D graphics library
-	depends = mesa-git=11.3.0_devel.81775.e79aa19
-	provides = mesa-libgl=11.3.0-devel
-	provides = libgl=11.3.0-devel
+	depends = mesa-git=12.1.0_devel.82587.154c0a4
+	provides = mesa-libgl=12.1.0-devel
+	provides = libgl=12.1.0-devel
 	conflicts = mesa-libgl
 	replaces = mesa-libgl
 
@@ -102,7 +103,7 @@ pkgname = mesa-git
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	optdepends = mesa-vdpau-git: for accelerated video playback
 	optdepends = libva-mesa-driver-git: for accelerated video playback
-	provides = mesa=11.3.0-devel
+	provides = mesa=12.1.0-devel
 	provides = mesa-r300-r600-radeonsi-git
 	provides = mesa-dri
 	conflicts = mesa
diff --git a/PKGBUILD b/PKGBUILD
index 3ff2437..49e0522 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,21 +12,27 @@
 pkgbase=mesa-git
 pkgname=('opencl-mesa-git' 'mesa-vulkan-intel-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' 'mesa-git')
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=11.3.0_devel.81775.e79aa19
+pkgver=12.1.0_devel.82587.154c0a4
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm-svn'
              'libomxil-bellagio' 'libcl' 'libclc' 'clang-svn' 'git' 'nettle' 'libtxc_dxtn' 'ocl-icd'
-             'libxvmc' 'vulkan-icd-loader' 'libgcrypt' 'libpthread-stubs')
+             'libxvmc' 'vulkan-icd-loader' 'libgcrypt')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master'
-        'LICENSE')
+        'LICENSE'
+        'remove-libpthread-stubs.patch')
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-         )
+         'e417399ed46be7f61da7246503965b13')
 
+prepare() {
+    cd ${srcdir}/mesa
+    patch -Np1 -i ../remove-libpthread-stubs.patch
+}         
+         
 pkgver() {
     cd mesa
     echo $(cat VERSION | tr "-" "_").$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
diff --git a/remove-libpthread-stubs.patch b/remove-libpthread-stubs.patch
new file mode 100644
index 0000000..5b44d03
--- /dev/null
+++ b/remove-libpthread-stubs.patch
@@ -0,0 +1,14 @@
+diff -ur mesa-orig/configure.ac mesa-origb/configure.ac
+--- mesa-orig/configure.ac	2016-05-25 15:37:44.191643017 +0200
++++ mesa-origb/configure.ac	2016-05-25 15:42:20.861654709 +0200
+@@ -813,10 +813,6 @@
+ dnl pkgconfig files.
+ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+ 
+-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+-AC_SUBST(PTHREADSTUBS_CFLAGS)
+-AC_SUBST(PTHREADSTUBS_LIBS)
+-
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+     [AS_HELP_STRING([--enable-selinux],