diff --git a/common/shlibs b/common/shlibs
index bb446a3f911..a6aff0f55a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -111,20 +111,28 @@ libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libGLU.so.1 glu-9.0.0_1
 libEGL.so.1 libEGL-7.11_1
+libEGL.so.1 libEGL-git-20140722_1
 libEGL.so libEGL-1.0_1
 libGLESv1_CM.so libGLES-1.0_1
 libGLESv1_CM.so.1 libGLES-1.0_1
+libGLESv1_CM.so.1 libGLES-git-20140722_1
 libGLESv2.so.2 libGLES-1.0_1
+libGLESv2.so.2 libGLES-git-20140722_1
 libGLESv2.so libGLES-1.0_1
 libwayland-egl.so.1 libwayland-egl-9.0.1_4
+libwayland-egl.so.1 libwayland-egl-git-20140722_1
 libGL.so.1 libGL-7.11_1
+libGL.so.1 libGL-git-20140722_1
 libGL.so.1 catalyst-14.2_1
 libGL.so.1 nvidia-334.00_1
 libGL.so.1 nvidia304-304.00_1
 libGL.so.1 nvidia331-331.67_1
 libglapi.so.0 libglapi-7.11_1
+libglapi.so.0 libglapi-git-20140722_1
 libOpenVG.so.1 libOpenVG-7.11_1
+libOpenVG.so.1 libOpenVG-git-20140722_1
 libgbm.so.1 libgbm-9.0_1
+libgbm.so.1 libgbm-git-20140722_1
 librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
diff --git a/srcpkgs/MesaLib-devel-git b/srcpkgs/MesaLib-devel-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/MesaLib-devel-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/MesaLib-git/template b/srcpkgs/MesaLib-git/template
new file mode 100644
index 00000000000..7ef0cb67901
--- /dev/null
+++ b/srcpkgs/MesaLib-git/template
@@ -0,0 +1,255 @@
+# Template build file for 'MesaLib-git'.
+pkgname=MesaLib-git
+version=20140722
+revision=1
+wrksrc="Mesa-git-${version}"
+build_style=gnu-configure
+configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
+ --enable-gles1 --enable-gles2 --enable-openvg --enable-egl --enable-vdpau
+ --enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
+ --with-egl-platforms=x11,drm,wayland"
+replaces="MesaLib>=0"
+provides="MesaLib-${version}_${revision}"
+short_desc="Graphics library similar to SGI's OpenGL"
+maintainer="John Galt <johngaltfirstrun@gmail.com>"
+homepage="http://www.mesa3d.org/"
+license="MIT, LGPL-2.1"
+
+hostmakedepends="
+ automake libtool flex pkg-config llvm-git libxml2-python wayland-devel"
+makedepends="
+ glproto dri2proto>=2.1 dri3proto presentproto libXext-devel libXxf86vm-devel
+ libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel
+ libXdamage-devel libXvMC-devel>=1.0.6 libxshmfence-devel wayland-devel
+ elfutils-devel ncurses-devel zlib-devel libffi-devel"
+
+# Set subpackages manually to set proper rdeps in 32bit pkgs.
+subpackages="libglapi-git libgbm-git libEGL-git libGL-git libGLES-git
+ libOpenVG-git libOSMesa-git libwayland-egl-git MesaLib-devel-git
+ mesa-swraster-dri-git"
+
+case "$XBPS_TARGET_MACHINE" in
+i686*|x86_64*)
+	# Enable all x86 drivers.
+	configure_args+=" --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau"
+	configure_args+=" --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast"
+	configure_args+=" --enable-xa --enable-dri3"
+	configure_args+=" --enable-opencl --enable-opencl-icd --enable-r600-llvm-compiler"
+	hostmakedepends+=" clang-git libllvm-git libclc-devel-git"
+	subpackages+=" libxatracker-git mesa-ati-dri-git mesa-intel-dri-git"
+	subpackages+=" mesa-nouveau-dri-git mesa-vmwgfx-dri-git mesa-opencl-git"
+	;;
+*)
+	# Enable swrast driver.
+	configure_args+=" --with-gallium-drivers=swrast"
+	configure_args+=" --with-dri-drivers=swrast"
+	configure_args+=" --disable-xa"
+	;;
+esac
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";;
+	*) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";;
+esac
+
+conf_files="/etc/drirc"
+
+do_fetch() {
+	local url="git://anongit.freedesktop.org/mesa/mesa"
+	local sha=9548ba6e7bb8e631f6ef6236f7425725239742fe
+	msg_normal "Fetching source from $url ...\n"
+	git clone ${url} ${wrksrc}
+	cd ${wrksrc}
+	git reset --hard ${sha}
+}
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+	libtoolize -f
+}
+
+post_install() {
+	vmkdir usr/lib/xorg/modules/extensions
+	ln -s libglx-xorg.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
+}
+
+libglapi-git_package() {
+	depends="libudev"
+	short_desc="Free implementation of the GL API - shared library"
+	replaces="libglapi>=0"
+	provides="libglapi-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libglapi.so.*"
+	}
+}
+
+libEGL-git_package() {
+	short_desc="Free implementation of the EGL API - runtime"
+	replaces="libEGL>=0"
+	provides="libEGL-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libEGL*.so.*"
+	}
+}
+
+libGLES-git_package() {
+	depends="libudev"
+	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
+	replaces="libGLES>=0"
+	provides="libGLES-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libGLES*.so.*"
+	}
+}
+
+libgbm-git_package() {
+	short_desc="Mesa Generic buffer management API - runtime"
+	replaces="libgbm>=0"
+	provides="libgbm-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libgbm.so.*"
+		vmove usr/lib/gbm/gbm_gallium_drm.so
+	}
+}
+
+libGL-git_package() {
+	depends="libudev"
+	short_desc="Free implementation of the OpenGL API - GLX runtime"
+	replaces="libGL>=0"
+	provides="libGL-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libGL.so.*"
+		vmove usr/lib/xorg/modules/extensions
+	}
+}
+
+libOpenVG-git_package() {
+	short_desc="Free implementation of the OpenVG API - runtime"
+	replaces="libOpenVG>=0"
+	provides="libOpenVG-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libOpenVG.so.*"
+	}
+}
+
+libOSMesa-git_package() {
+	short_desc="Mesa Off-Screen interface library"
+	replaces="libOSMesa>=0"
+	provides="libOSMesa-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libOSMesa.so.*"
+	}
+}
+
+libwayland-egl-git_package() {
+	short_desc="Free implementation of the EGL API - wayland runtime"
+	replaces="libwayland-egl>=0"
+	provides="libwayland-egl-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libwayland-egl.so.*"
+		vmove usr/lib/egl
+	}
+}
+
+MesaLib-devel-git_package() {
+	depends="glproto dri2proto>=2.1 dri3proto presentproto libxshmfence-devel
+		libXext-devel libXxf86vm-devel libXdamage-devel expat-devel
+		libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39
+		libGL-git>=${version}_${revision} libOpenVG-git>=${version}_${revision}
+		libGLES-git>=${version}_${revision} libEGL-git>=${version}_${revision}
+		libOSMesa-git>=${version}_${revision} libgbm-git>=${version}_${revision}
+		libwayland-egl-git>=${version}_${revision}"
+	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		depends+=" libxatracker-git>=${version}_${revision}"
+	fi
+	short_desc+=" - development files"
+	replaces="MesaLib-devel>=0"
+	provides="MesaLib-devel-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+mesa-swraster-dri-git_package() {
+	short_desc="Mesa DRI drivers for the Software Rasterizer"
+	replaces="mesa-swraster-dri>=0"
+	provides="mesa-swraster-dri-${version}_${revision}"
+	depends="libGL-git libEGL-git libGLES-git"
+	pkg_install() {
+		vmove "usr/lib/xorg/modules/drivers/swrast*"
+		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
+	}
+}
+
+libxatracker-git_package() {
+	short_desc="Mesa XA tracker interface library"
+	replaces="libxatracker>=0"
+	provides="libxatracker-${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libxatracker*.so.*"
+	}
+}
+
+mesa-ati-dri-git_package() {
+	short_desc="Mesa DRI drivers for ATI GPUs"
+	replaces="mesa-ati-dri>=0"
+	provides="mesa-ati-dri-${version}_${revision}"
+	depends="libGL-git libEGL-git libGLES-git"
+	pkg_install() {
+		vmove "usr/lib/libXvMCr[36]00.so*"
+		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
+		vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
+		vmove "usr/lib/xorg/modules/drivers/radeon*"
+		vmove "usr/lib/xorg/modules/drivers/r[236]00*"
+		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
+		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
+	}
+}
+
+mesa-intel-dri-git_package() {
+	short_desc="Mesa DRI drivers for Intel GPUs"
+	replaces="mesa-intel-dri>=0"
+	provides="mesa-intel-dri-${version}_${revision}"
+	depends="libGL-git libEGL-git libGLES-git"
+	pkg_install() {
+		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
+	}
+}
+
+mesa-nouveau-dri-git_package() {
+	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
+	replaces="mesa-nouveau-dri>=0"
+	provides="mesa-nouveau-dri-${version}_${revision}"
+	depends="libGL-git libEGL-git libGLES-git"
+	pkg_install() {
+		vmove "usr/lib/libXvMCnouveau.so*"
+		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
+		vmove "usr/lib/xorg/modules/drivers/nouveau*"
+		vmove usr/lib/gallium-pipe/pipe_nouveau.so
+	}
+}
+
+mesa-vmwgfx-dri-git_package() {
+	short_desc="Mesa DRI drivers for VMware"
+	replaces="mesa-vmwgfx-dri>=0"
+	provides="mesa-vmwgfx-dri-${version}_${revision}"
+	depends="libGL-git libEGL-git libGLES-git"
+	pkg_install() {
+		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
+		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
+	}
+}
+
+mesa-opencl-git_package() {
+	short_desc="Mesa implementation of OpenCL (r600+ only)"
+	replaces="mesa-opencl>=0"
+	provides="mesa-opencl-${version}_${revision}"
+	depends="libclc-r600 libOpenCL"
+	pkg_install() {
+		vmove etc/OpenCL
+		vmove "/usr/lib/lib*OpenCL*"
+		mv ${XBPS_DESTDIR}/MesaLib-devel-git-${version}/usr/lib/lib*OpenCL.so ${PKGDESTDIR}/usr/lib
+	}
+}
diff --git a/srcpkgs/libEGL-git b/srcpkgs/libEGL-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libEGL-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libGL-git b/srcpkgs/libGL-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libGL-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libGLES-git b/srcpkgs/libGLES-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libGLES-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libOSMesa-git b/srcpkgs/libOSMesa-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libOSMesa-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libOpenVG-git b/srcpkgs/libOpenVG-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libOpenVG-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libgbm-git b/srcpkgs/libgbm-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libgbm-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libglapi-git b/srcpkgs/libglapi-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libglapi-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libwayland-egl-git b/srcpkgs/libwayland-egl-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libwayland-egl-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/libxatracker-git b/srcpkgs/libxatracker-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/libxatracker-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/mesa-ati-dri-git b/srcpkgs/mesa-ati-dri-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/mesa-ati-dri-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/mesa-intel-dri-git b/srcpkgs/mesa-intel-dri-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/mesa-intel-dri-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/mesa-nouveau-dri-git b/srcpkgs/mesa-nouveau-dri-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/mesa-nouveau-dri-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/mesa-opencl-git b/srcpkgs/mesa-opencl-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/mesa-opencl-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/mesa-swraster-dri-git b/srcpkgs/mesa-swraster-dri-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/mesa-swraster-dri-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file
diff --git a/srcpkgs/mesa-vmwgfx-dri-git b/srcpkgs/mesa-vmwgfx-dri-git
new file mode 120000
index 00000000000..2803ad10b07
--- /dev/null
+++ b/srcpkgs/mesa-vmwgfx-dri-git
@@ -0,0 +1 @@
+MesaLib-git
\ No newline at end of file