diff --git a/.SRCINFO b/.SRCINFO
index eb13d93..2ae7d07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
-# Generated by makepkg 4.2.0
-# Thu Jan 15 21:18:09 UTC 2015
 pkgbase = mesa-git
-	pkgver = 10.5.0_devel.67557
-	pkgrel = 1
+	pkgver = 11.0.0_devel.71858.a97f1b6
+	pkgrel = 3
 	url = http://mesa3d.sourceforge.net
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = python2
+	makedepends = python2-mako
 	makedepends = libxml2
 	makedepends = libx11
 	makedepends = glproto
@@ -22,13 +20,16 @@ pkgbase = mesa-git
 	makedepends = libva
 	makedepends = wayland
 	makedepends = elfutils
-	makedepends = llvm
+	makedepends = llvm-svn
 	makedepends = systemd
 	makedepends = libomxil-bellagio
 	makedepends = libclc
-	makedepends = clang
-	makedepends = python2-mako
+	makedepends = clang-svn
 	makedepends = git
+	makedepends = libtxc_dxtn
+	makedepends = ocl-icd
+	makedepends = openssl
+	makedepends = gnutls
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master
 	source = LICENSE
 	md5sums = SKIP
@@ -41,11 +42,14 @@ pkgname = opencl-mesa-git
 	depends = elfutils
 	depends = libxfixes
 	depends = libxext
-	depends = libcl
+	depends = ocl-icd
 	depends = libclc
-	depends = clang
+	depends = clang-svn
+	depends = llvm-libs-svn
+	depends = nettle
+	depends = mesa-git=11.0.0_devel.71858.a97f1b6
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-mesa
+	provides = opencl-mesa=
 	conflicts = opencl-mesa
 	replaces = opencl-mesa
 
@@ -53,21 +57,24 @@ pkgname = libva-mesa-driver-git
 	pkgdesc = VA-API implementation for gallium
 	depends = libdrm
 	depends = libx11
-	depends = llvm-libs
+	depends = llvm-libs-svn
 	depends = expat
 	depends = elfutils
-	provides = libva-mesa-driver
+	depends = nettle
+	depends = mesa-git=11.0.0_devel.71858.a97f1b6
+	provides = libva-mesa-driver=
 	conflicts = libva-mesa-driver
-	replaces = libva-mesa-driver
 
 pkgname = mesa-vdpau-git
 	pkgdesc = Mesa VDPAU drivers
 	depends = libdrm
 	depends = libx11
-	depends = llvm-libs
+	depends = llvm-libs-svn
 	depends = expat
 	depends = elfutils
-	provides = mesa-vdpau
+	depends = nettle
+	depends = mesa-git=11.0.0_devel.71858.a97f1b6
+	provides = mesa-vdpau=
 	conflicts = mesa-vdpau
 	replaces = mesa-vdpau
 
@@ -83,68 +90,25 @@ pkgname = mesa-git
 	depends = libomxil-bellagio
 	depends = expat
 	depends = libtxc_dxtn
-	depends = llvm-libs
+	depends = llvm-libs-svn
 	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=10.5.0-devel
-	provides = libglapi
-	provides = osmesa
-	provides = libgbm
-	provides = libgles
-	provides = libegl
-	provides = khrplatform-devel
-	provides = ati-dri
-	provides = intel-dri
-	provides = nouveau-dri
-	provides = svga-dri
+	provides = mesa=
+	provides = mesa-r300-r600-radeonsi-git
 	provides = mesa-dri
-	provides = ati-dri-git
-	provides = intel-dri-git
-	provides = nouveau-dri-git
-	provides = svga-dri-git
-	provides = mesa-dri-git
 	conflicts = mesa
-	conflicts = libglapi
-	conflicts = osmesa
-	conflicts = libgbm
-	conflicts = libgles
-	conflicts = libegl
-	conflicts = khrplatform-devel
-	conflicts = ati-dri
-	conflicts = intel-dri
-	conflicts = nouveau-dri
-	conflicts = svga-dri
+	conflicts = mesa-r300-r600-radeonsi-git
 	conflicts = mesa-dri
-	conflicts = ati-dri-git
-	conflicts = intel-dri-git
-	conflicts = nouveau-dri-git
-	conflicts = svga-dri-git
-	conflicts = mesa-dri-git
 	replaces = mesa
-	replaces = libglapi
-	replaces = osmesa
-	replaces = libgbm
-	replaces = libgles
-	replaces = libegl
-	replaces = khrplatform-devel
-	replaces = ati-dri
-	replaces = intel-dri
-	replaces = nouveau-dri
-	replaces = svga-dri
+	replaces = mesa-r300-r600-radeonsi-git
 	replaces = mesa-dri
-	replaces = ati-dri-git
-	replaces = intel-dri-git
-	replaces = nouveau-dri-git
-	replaces = svga-dri-git
-	replaces = mesa-dri-git
 
 pkgname = mesa-libgl-git
 	pkgdesc = Mesa 3-D graphics library
-	depends = mesa=10.5.0-devel
-	provides = mesa-libgl=10.5.0-devel
-	provides = libgl=10.5.0-devel
+	depends = mesa-git=11.0.0_devel.71858.a97f1b6
+	provides = mesa-libgl=
+	provides = libgl=
 	conflicts = mesa-libgl
 	replaces = mesa-libgl
-	replaces = libgl
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c09d2d..ff74bf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Armin K. <krejzi at email dot com>
+# Maintainer: Lone_Wolf <lonewolf at xs4all dot nl>
+# Contributor: Armin K. <krejzi at email dot com>
 # Contributor: Kristian Klausen <klausenbusk@hotmail.com>
 # Contributor: Egon Ashrafinia <e.ashrafinia@gmail.com>
 # Contributor: Tavian Barnes <tavianator@gmail.com>
@@ -10,12 +11,14 @@
 
 pkgbase=mesa-git
 pkgname=('opencl-mesa-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-git' 'mesa-libgl-git')
-pkgver=10.5.0_devel.67557
-pkgrel=1
+pkgver=11.0.0_devel.71858.a97f1b6
+pkgrel=3
 arch=('i686' 'x86_64')
-makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
-             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
-             'systemd' 'libomxil-bellagio' 'libclc' 'clang' 'python2-mako' 'git')
+makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
+             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm-svn'
+             'systemd' 'libomxil-bellagio' 'libclc' 'clang-svn' 'git'
+             'libtxc_dxtn' 'ocl-icd' 'openssl' 'gnutls')
+             
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master'
@@ -25,7 +28,7 @@ md5sums=('SKIP'
 
 pkgver() {
     cd "${srcdir}/mesa"
-    echo $(cat VERSION | tr "-" "_").$(git rev-list --count HEAD)
+    echo $(cat VERSION | tr "-" "_").$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 _mesaver() {
@@ -63,6 +66,7 @@ build () {
                --enable-opencl-icd \
                --with-clang-libdir=/usr/lib
 
+
   make
 
   # fake installation
@@ -72,9 +76,9 @@ build () {
 
 package_opencl-mesa-git () {
   pkgdesc="OpenCL support for AMD/ATI Radeon Mesa drivers"
-  depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'libcl' 'libclc' 'clang')
+  depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'ocl-icd' 'libclc' 'clang-svn' 'llvm-libs-svn' 'nettle' "mesa-git=${pkgver}")
   optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-mesa')
+  provides=("opencl-mesa=$(_mesaver)")
   replaces=('opencl-mesa')
   conflicts=('opencl-mesa')
 
@@ -85,60 +89,48 @@ package_opencl-mesa-git () {
   mv -v "${srcdir}"/fakeinstall/usr/lib/lib*OpenCL* "${pkgdir}/usr/lib/"
   mv -v "${srcdir}"/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so "${pkgdir}/usr/lib/gallium-pipe/"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
-  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
-
-  ln -sfv opencl-mesa "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa-git/"
 }
 
 package_libva-mesa-driver-git() {
   pkgdesc="VA-API implementation for gallium"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
-  provides=('libva-mesa-driver')
-  replaces=('libva-mesa-driver')
+  depends=('libdrm' 'libx11' 'llvm-libs-svn' 'expat' 'elfutils' 'nettle' "mesa-git=${pkgver}")
+  provides=("libva-mesa-driver=$(_mesaver)")
   conflicts=('libva-mesa-driver')
 
   install -v -m755 -d "${pkgdir}/usr/lib"
   mv -v "${srcdir}/fakeinstall/usr/lib/dri" "${pkgdir}/usr/lib/"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
-  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
-
-  ln -sfv libva-mesa-driver "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver-git/"
 }
 
+
 package_mesa-vdpau-git() {
   pkgdesc="Mesa VDPAU drivers"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
-  provides=('mesa-vdpau')
+  depends=('libdrm' 'libx11' 'llvm-libs-svn' 'expat' 'elfutils' 'nettle' "mesa-git=${pkgver}")
+  provides=("mesa-vdpau=$(_mesaver)")
   replaces=('mesa-vdpau')
   conflicts=('mesa-vdpau')
 
   install -v -m755 -d "${pkgdir}/usr/lib"
   mv -v "${srcdir}/fakeinstall/usr/lib/vdpau" "${pkgdir}/usr/lib/"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
-  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
-
-  ln -sfv mesa-vdpau "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau-git/"
 }
 
 package_mesa-git () {
   pkgdesc="an open-source implementation of the OpenGL specification"
   depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils'
-           'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs')
+           'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs-svn')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'mesa-vdpau-git: for accelerated video playback'
               'libva-mesa-driver-git: for accelerated video playback')
-  provides=("mesa=$(_mesaver)" 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-            'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri'
-            'ati-dri-git' 'intel-dri-git' 'nouveau-dri-git' 'svga-dri-git' 'mesa-dri-git')
-  replaces=('mesa' 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-            'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri'
-            'ati-dri-git' 'intel-dri-git' 'nouveau-dri-git' 'svga-dri-git' 'mesa-dri-git')
-  conflicts=('mesa' 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-             'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri'
-             'ati-dri-git' 'intel-dri-git' 'nouveau-dri-git' 'svga-dri-git' 'mesa-dri-git')
+  provides=("mesa=$(_mesaver)" 'mesa-r300-r600-radeonsi-git' 'mesa-dri')
+  replaces=('mesa' 'mesa-r300-r600-radeonsi-git' 'mesa-dri')
+  conflicts=('mesa' 'mesa-r300-r600-radeonsi-git' 'mesa-dri')
 
   install -v -m755 -d "${pkgdir}/etc"
   mv -v "${srcdir}/fakeinstall/etc/drirc" "${pkgdir}/etc/"
@@ -160,17 +152,15 @@ package_mesa-git () {
   mv -v "${pkgdir}"/usr/lib/libEGL.so*   "${pkgdir}/usr/lib/mesa/"
   mv -v "${pkgdir}"/usr/lib/libGLES*.so* "${pkgdir}/usr/lib/mesa/"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-
-  ln -sfv mesa "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-git/"
 }
 
 package_mesa-libgl-git () {
   pkgdesc="Mesa 3-D graphics library"
-  depends=("mesa=$(_mesaver)")
+  depends=("mesa-git=${pkgver}")
   provides=("mesa-libgl=$(_mesaver)" "libgl=$(_mesaver)")
-  replaces=('mesa-libgl' 'libgl')
+  replaces=('mesa-libgl')
   conflicts=('mesa-libgl')
 
   # See FS#26284
@@ -193,8 +183,6 @@ package_mesa-libgl-git () {
   ln -sfv libGLESv2.so.2.0.0               "${pkgdir}/usr/lib/libGLESv2.so.2"
   ln -sfv libGLESv2.so.2.0.0               "${pkgdir}/usr/lib/libGLESv2.so"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
-  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
-
-  ln -sfv mesa-libgl "${pkgdir}/usr/share/licenses/${pkgname}"
-}
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl-git/"
+}
\ No newline at end of file