diff --git a/cc/config/global.go b/cc/config/global.go
index 3784824..55ae9e3 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -116,8 +116,8 @@
 
 	// prebuilts/clang default settings.
 	ClangDefaultBase         = "prebuilts/clang/host"
-	ClangDefaultVersion      = "clang-4393122"
-	ClangDefaultShortVersion = "5.0.1"
+	ClangDefaultVersion      = "clang-4579689"
+	ClangDefaultShortVersion = "6.0.1"
 
 	// Directories with warnings from Android.bp files.
 	WarningAllowedProjects = []string{