--- a/browser/config/tooltool-manifests/macosx64/clang.manifest
+++ b/browser/config/tooltool-manifests/macosx64/clang.manifest
@@ -1,13 +1,14 @@
 [
   {
-    "version": "clang 3.9.0",
-    "size": 185632474,
-    "digest": "0e1a556b65d6398fa812b9ceb5ce5e2dec3eda77d4a032a818182b34fc8ce602412f42388bb1fda6bea265d35c1dde3847a730b264fec01cd7e3dcfd39941660",
+    "version": "clang 4.0.1 gecko build for macOS",
+    "size": 212696490,
+    "visibility": "public",
+    "digest": "0c78c8046e9559bba9a7efc61d8ad873f598ecd274662de113f962c907df80763ebba182ffcc253d56e46e6a66a67219dc861eae96d8be94d47f2d575fc51144",
     "algorithm": "sha512",
     "filename": "clang.tar.bz2",
     "unpack": true
   },
   {
     "version": "rustc 1.18.0 (03fc9d622 2017-06-06) repack",
     "size": 97110232,
     "digest": "7df456b9f86a0f11b81700b6bbb9451137beb5a4035fe2330dc507c804fe8230573636720dba60308eee5305b7c04bc041c025ca0ca98bef54f98f98b48dd8d7",

--- a/browser/config/tooltool-manifests/macosx64/cross-clang.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-clang.manifest
@@ -1,13 +1,14 @@
 [
   {
-    "version": "clang 3.9.0",
-    "size": 166261192,
-    "digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
+    "version": "clang 4.0.1 gecko build for linux",
+    "size": 215309284,
+    "visibility": "public",
+    "digest": "8f6d386ca1d4606526dd24f366b1dbc1914c6c6d7f54c69c2a2ca0e7cfabe641c1168952d606295feffa9f38ad687084de5efb1e80be3ed2f431ac91de80039b",
     "algorithm": "sha512",
     "filename": "clang.tar.xz",
     "unpack": true
   },
   {
     "version": "gcc 4.9.4 + PR64905",
     "size": 101297752,
     "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",

--- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
@@ -1,13 +1,14 @@
 [
   {
-    "version": "clang + llvm 3.9.0, built from SVN r290136",
-    "size": 166261192,
-    "digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
+    "version": "clang 4.0.1 gecko build for linux",
+    "size": 215309284,
+    "visibility": "public",
+    "digest": "8f6d386ca1d4606526dd24f366b1dbc1914c6c6d7f54c69c2a2ca0e7cfabe641c1168952d606295feffa9f38ad687084de5efb1e80be3ed2f431ac91de80039b",
     "algorithm": "sha512",
     "filename": "clang.tar.xz",
     "unpack": true
   },
   {
     "size": 6075028,
     "visibility": "public",
     "digest": "0b962ba55a5a2fbae44218683bdf6ea0dfe8165aba436173a065f7190976184586b9acf4c23478bc5b6d81a3e00f681bf16df0536c9c9718ad0570d064f69027",

--- a/browser/config/tooltool-manifests/macosx64/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,13 +1,14 @@
 [
   {
-    "version": "clang 3.9.0",
-    "size": 185632474,
-    "digest": "0e1a556b65d6398fa812b9ceb5ce5e2dec3eda77d4a032a818182b34fc8ce602412f42388bb1fda6bea265d35c1dde3847a730b264fec01cd7e3dcfd39941660",
+    "version": "clang 4.0.1 gecko build for macOS",
+    "size": 212696490,
+    "visibility": "public",
+    "digest": "0c78c8046e9559bba9a7efc61d8ad873f598ecd274662de113f962c907df80763ebba182ffcc253d56e46e6a66a67219dc861eae96d8be94d47f2d575fc51144",
     "algorithm": "sha512",
     "filename": "clang.tar.bz2",
     "unpack": true
   },
   {
     "version": "rustc 1.18.0 (03fc9d622 2017-06-06) repack",
     "size": 97110232,
     "digest": "7df456b9f86a0f11b81700b6bbb9451137beb5a4035fe2330dc507c804fe8230573636720dba60308eee5305b7c04bc041c025ca0ca98bef54f98f98b48dd8d7",