diff --git a/common/shlibs b/common/shlibs
index 3cebb514d39..cb6151cfd09 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -907,7 +907,7 @@ libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.0 confuse-2.7_1
 libclang.so clang-3.4.2_1
 libclang.so clang-git-20140721_1
-libLLVM-3.4.so libllvm-3.4.2_1
+libLLVM-3.5.so libllvm-3.5.0_1
 libLLVM-3.6svn.so libllvm-git-20140816_1
 libisofs.so.6 libisofs-0.6.24_1
 libbfd-2.22.so binutils-2.22_1<2.23_1
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 73bd4f0a9a7..fa29c4dace4 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.2.7
-revision=1
+revision=2
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 68b49ab67a9..d20cae15a12 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,8 +1,8 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=3.4.2
+version=3.5.0
 wrksrc="llvm-${version}.src"
-revision=4
+revision=1
 lib32disabled=yes
 configure_args="--disable-expensive-checks --disable-debug-runtime
  --enable-bindings=none --enable-optimize --enable-shared --enable-libffi
@@ -14,13 +14,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.llvm.org"
 license="BSD"
 distfiles="
- http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.gz
- http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.gz
- http://www.llvm.org/releases/${version%.*}/compiler-rt-${version%.*}.src.tar.gz"
+ http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.xz
+ http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.xz
+ http://www.llvm.org/releases/${version}/compiler-rt-${version}.src.tar.xz"
 checksum="
- 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7
- 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10
- f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c"
+ 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03
+ fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b
+ a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136"
 
 # XXX Investigate ocaml bindings.
 hostmakedepends="groff perl python zlib-devel libffi-devel"