diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index dc0a20017..5682fcb1a 100644
--- a/vndk/tools/header-checker/android/envsetup.sh
+++ b/vndk/tools/header-checker/android/envsetup.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 export LLVM_BUILD_HOST_TOOLS=true
-export LLVM_PREBUILTS_VERSION=clang-r399163
-export LLVM_RELEASE_VERSION=11.0.4
+export LLVM_PREBUILTS_VERSION=clang-r399163b
+export LLVM_RELEASE_VERSION=11.0.5