diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index b7ea043992f..53f7d890b22 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,13 +1,13 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.2.4
-revision=1
+revision=2
 wrksrc="Mesa-${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
- --enable-llvm-shared-libs --with-egl-platforms=x11,drm,wayland"
+ --with-egl-platforms=x11,drm,wayland"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org/"
@@ -16,7 +16,7 @@ distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.t
 checksum=06a2341244eb85c283f59f70161e06ded106f835ed9b6be1ef0243bd9344811a
 
 hostmakedepends="
- automake libtool flex pkg-config llvm>=3.4.2_2 libxml2-python wayland-devel"
+ automake libtool flex pkg-config llvm 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
@@ -29,6 +29,8 @@ i686*|x86_64*)
 	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-r600-llvm-compiler"
+	hostmakedepends+=" clang libclc-devel-git"
 	;;
 *)
 	# Enable swrast driver.
@@ -203,4 +205,12 @@ mesa-vmwgfx-dri_package() {
 	}
 }
 
+mesa-opencl_package() {
+	short_desc="Mesa implementation of OpenCL (r600+ only)"
+	depends="libclc-r600"
+	pkg_install() {
+		vmove "/usr/lib/libOpenCL*"
+	}
+}
+
 fi # x86
diff --git a/srcpkgs/mesa-opencl b/srcpkgs/mesa-opencl
new file mode 120000
index 00000000000..8bf5fbea217
--- /dev/null
+++ b/srcpkgs/mesa-opencl
@@ -0,0 +1 @@
+MesaLib
\ No newline at end of file