diff --git a/extra/clang/build b/extra/clang/build
index 4285a6c6..d12dc8d7 100755
--- a/extra/clang/build
+++ b/extra/clang/build
@@ -18,8 +18,10 @@ cmake --install build
 # Fix up libexec location. This can't be done during
 # the configure stage of the build as it is hardcoded.
 {
-    mv -f "$1/usr/libexec/ccc-analyzer" "$1/usr/lib/clang"
-    mv -f "$1/usr/libexec/c++-analyzer" "$1/usr/lib/clang"
+    mv -f \
+        "$1/usr/libexec/"*analyze* \
+        "$1/usr/libexec/"*intercept* \
+        "$1/usr/lib/clang"
 
     rmdir "$1/usr/libexec"
 
diff --git a/extra/clang/checksums b/extra/clang/checksums
index 1e2028fe..25cc06dc 100644
--- a/extra/clang/checksums
+++ b/extra/clang/checksums
@@ -1 +1 @@
-6e912133bcf56e9cfe6a346fa7e5c52c2cde3e4e48b7a6cc6fcc7c75047da45f
+5d611cbb06cfb6626be46eb2f23d003b2b80f40182898daa54b1c4e8b5b9e17e
diff --git a/extra/clang/version b/extra/clang/version
index 0ada45b8..acbb1e0c 100644
--- a/extra/clang/version
+++ b/extra/clang/version
@@ -1 +1 @@
-12.0.1 1
+13.0.0 1