diff --git a/common/shlibs b/common/shlibs
index 62f43cd1e6..e847ea6d22 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1031,8 +1031,8 @@ 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
 liblldb.so.10 lldb-10.0.0_1
-libclang.so.10 clang-10.0.0_1
-libclang-cpp.so.10 clang-10.0.0_1
+libclang.so.10 libclang-10.0.0_3
+libclang-cpp.so.10 libclang-cpp-10.0.0_3
 libLLVM-10.so libllvm10-10.0.0_1
 libLLVM-9.so libllvm9-9.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
diff --git a/srcpkgs/libclang b/srcpkgs/libclang
new file mode 120000
index 0000000000..59f26575cb
--- /dev/null
+++ b/srcpkgs/libclang
@@ -0,0 +1 @@
+llvm10
\ No newline at end of file
diff --git a/srcpkgs/libclang-cpp b/srcpkgs/libclang-cpp
new file mode 120000
index 0000000000..59f26575cb
--- /dev/null
+++ b/srcpkgs/libclang-cpp
@@ -0,0 +1 @@
+llvm10
\ No newline at end of file
diff --git a/srcpkgs/llvm10/template b/srcpkgs/llvm10/template
index c4ddcf123f..902ca3f505 100644
--- a/srcpkgs/llvm10/template
+++ b/srcpkgs/llvm10/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm10'
 pkgname=llvm10
 version=10.0.0
-revision=2
+revision=3
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -48,7 +48,7 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*) _lldb_enable=no ;;
 esac
 
-subpackages="clang-tools-extra clang clang-analyzer libllvm10"
+subpackages="clang-tools-extra clang clang-analyzer libclang libclang-cpp libllvm10"
 if [ "$_lldb_enable" = "yes" ]; then
 	# XXX fails to cross compile due to python
 	subpackages+=" lldb lldb-devel"
@@ -198,6 +198,7 @@ clang-analyzer_package() {
 }
 
 clang-tools-extra_package() {
+	lib32disabled=yes
 	depends="clang-${version}_${revision} python3"
 	short_desc+=" - Extra Clang tools"
 	homepage="https://clang.llvm.org/extra/"
@@ -221,7 +222,8 @@ clang-tools-extra_package() {
 
 clang_package() {
 	lib32disabled=yes
-	depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel"
+	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
+	 libclang-${version}_${revision}"
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
@@ -231,11 +233,26 @@ clang_package() {
 		vmove usr/bin/c-index-test
 		vmove usr/lib/clang
 		vmove usr/lib/cmake/clang
-		vmove "usr/lib/libclang*"
+		vmove "usr/lib/libclang*.a"
+		vmove "usr/lib/libclang*.so"
 		vmove "usr/share/clang"
 	}
 }
 
+libclang_package() {
+	short_desc+=" - C frontend runtime library"
+	pkg_install() {
+		vmove "usr/lib/libclang.so.*"
+	}
+}
+
+libclang-cpp_package() {
+	short_desc+=" - C frontend runtime library (C++ interface)"
+	pkg_install() {
+		vmove "usr/lib/libclang-cpp.so.*"
+	}
+}
+
 lld_package() {
 	lib32disabled=yes
 	short_desc+=" - linker"
@@ -272,6 +289,7 @@ lldb_package() {
 }
 
 lldb-devel_package() {
+	lib32disabled=yes
 	depends="lldb>=${version}_${revision}"
 	short_desc+=" - LLDB debugger - development files"
 	pkg_install() {