diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 8362a63..f46865c 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 export LLVM_BUILD_HOST_TOOLS=true
-export LLVM_PREBUILTS_VERSION=clang-r344140b
-export LLVM_RELEASE_VERSION=8.0.4
+export LLVM_PREBUILTS_VERSION=clang-r346389
+export LLVM_RELEASE_VERSION=8.0.5
 
 # FIXME: Workaround to build bionic versioner in the aosp/clang-tools branch.
 export FORCE_BUILD_LLVM_COMPONENTS=true