diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 28e0c31adb7..fd4c05b3b54 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm'
 pkgname=llvm
 version=3.8.0
-revision=2
+revision=3
 wrksrc="llvm-${version}.src"
 lib32disabled=yes
 build_style=cmake
@@ -209,13 +209,16 @@ lld-devel_package() {
 }
 lldb_package() {
 	lib32disabled=yes
+	depends+=" python-six"
 	short_desc+=" - LLDB debugger"
 	homepage="http://lldb.llvm.org/"
 	pkg_install() {
-		vmove "usr/bin/*lldb*"
-		vmove "usr/lib/liblldb*so.*"
+		vmove usr/bin/*lldb*
+		vmove usr/lib/liblldb*so.*
 		vman tools/lldb/docs/lldb.1
-		vmove "/usr/lib/python*"
+		vmove /usr/lib/python*
+		# Depend on python-six instead of conflicting
+		rm "${DESTDIR}/usr/lib/python2.7/site-packages/six.py"
 	}
 }
 lldb-devel_package() {