diff --git a/common/shlibs b/common/shlibs
index 62a52a0de5f..bb0a110a099 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -918,12 +918,13 @@ libyaml-0.so.2 libyaml-0.1.4_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
-libclang.so.5 clang-5.0.0_1
+libclang.so.6 clang-6.0.0_1
 libLLVM-3.8.so libllvm3.8-3.8.0_1
 libLLVM-3.8.1.so libllvm3.8-3.8.1_1
 libLLVM-3.9.so libllvm3.9-3.9.0_1
 libLLVM-4.0.so libllvm4.0-4.0.0_1
 libLLVM-5.0.so libllvm5.0-5.0.0_1
+libLLVM-6.0.so libllvm6.0-6.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libv8.so.3.24 libv8-3.24.35.22_1
 libGeoIP.so.1 libgeoip-1.4.8_1
diff --git a/srcpkgs/libllvm5.0 b/srcpkgs/libllvm6.0
similarity index 100%
rename from srcpkgs/libllvm5.0
rename to srcpkgs/libllvm6.0
diff --git a/srcpkgs/llvm/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch b/srcpkgs/llvm/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch
deleted file mode 100644
index 70908618b15..00000000000
--- a/srcpkgs/llvm/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/interception/interception_linux.cc
-+++ b/lib/interception/interception_linux.cc
-@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
-   return real == wrapper;
- }
- 
--#if !defined(__ANDROID__)  // android does not have dlvsym
-+#if defined(__GLIBC__) // !defined(__ANDROID__)  // android does not have dlvsym
- void *GetFuncAddrVer(const char *func_name, const char *ver) {
-   return dlvsym(RTLD_NEXT, func_name, ver);
- }
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 69a1f746165..f9d12ef0128 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,6 +1,6 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=5.0.1
+version=6.0.0
 revision=1
 wrksrc="llvm-${version}.src"
 lib32disabled=yes
@@ -16,7 +16,7 @@ configure_args="
 short_desc="Low Level Virtual Machine"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.llvm.org"
-license="BSD"
+license="NCSA"
 distfiles="
  http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.xz
  http://www.llvm.org/releases/${version}/lldb-${version}.src.tar.xz
@@ -24,24 +24,24 @@ distfiles="
  http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.xz
  http://www.llvm.org/releases/${version}/clang-tools-extra-${version}.src.tar.xz
  http://www.llvm.org/releases/${version}/compiler-rt-${version}.src.tar.xz"
-checksum="5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0
- b7c1c9e67975ca219089a3a6a9c77c2d102cead2dc38264f2524aa3326da376a
- d5b36c0005824f07ab093616bdff247f3da817cae2c51371e1d1473af717d895
- 135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff
- 9aada1f9d673226846c3399d13fab6bba4bfd38bcfe8def5ee7b0ec24f8cd225
- 4edd1417f457a9b3f0eb88082530490edf3cf6a7335cdce8ecbc5d3e16a895da"
+checksum="1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408
+ 46f54c1d7adcd047d87c0179f7b6fa751614f339f4f87e60abceaa45f414d454
+ 6b8c4a833cf30230c0213d78dbac01af21387b298225de90ab56032ca79c0e0b
+ e07d6dd8d9ef196cfc8e8bb131cbd6a2ed0b1caf1715f9d05b0f0eeaddb6df32
+ 053b424a4cd34c9335d8918734dd802a8da612d13a26bbb88fcdf524b2d989d2
+ d0cc1342cf57e9a8d52f5498da47a3b28d24ac0d39cbc92308781b3ee0cea79a"
 
 # XXX Investigate ocaml bindings.
 hostmakedepends="groff perl python zlib-devel libffi-devel swig"
 makedepends="python-devel zlib-devel libffi-devel libedit-devel libxml2-devel binutils-devel libatomic-devel"
-depends="libllvm5.0"
+depends="libllvm6.0"
 
 # XXX mips builds fail with 'Error: branch out of range'
 case "$XBPS_TARGET_MACHINE" in
 	mips*) broken="make[2]: *** [lib/Target/ARM/CMakeFiles/LLVMARMCodeGen.dir/build.make:855: lib/Target/ARM/CMakeFiles/LLVMARMCodeGen.dir/ARMInstructionSelector.cpp.o] Error 1" ;;
 esac
 
-subpackages="clang-tools-extra clang clang-analyzer libllvm5.0"
+subpackages="clang-tools-extra clang clang-analyzer libllvm6.0"
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX fails to cross compile due to python
 	subpackages+=" lldb lldb-devel"
@@ -56,12 +56,6 @@ post_extract() {
 		patch -sNp1 -i ${i}
 	done
 
-	cd ${XBPS_BUILDDIR}/compiler-rt-${version}.src
-	for i in ${FILESDIR}/patches/compiler-rt/compiler-rt-*.patch; do
-		msg_normal "Applying $i to compiler-rt\n"
-		patch -sNp1 -i ${i}
-	done
-
 	cd ${XBPS_BUILDDIR}/cfe-${version}.src
 	for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do
 		msg_normal "Applying $i to cfe\n"
@@ -248,7 +242,7 @@ lldb-devel_package() {
 		vmove "usr/lib/liblldb*.so"
 	}
 }
-libllvm5.0_package() {
+libllvm6.0_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/libLLVM-*.so*"