diff --git a/build/unix/build-hfsplus/build-hfsplus.sh b/build/unix/build-hfsplus/build-hfsplus.sh
index 7b3b2043dc5a..6eff24c2640a 100755
--- a/build/unix/build-hfsplus/build-hfsplus.sh
+++ b/build/unix/build-hfsplus/build-hfsplus.sh
@@ -17,15 +17,12 @@ if test -z $TMPDIR; then
   TMPDIR=/tmp/
 fi
 
-# Install clang first
-yum install -y clang
-
 # Set an md5 check file to validate input
 echo "${md5sum} *${TMPDIR}/${filename}" > $TMPDIR/hfsplus.MD5
 
 # Most-upstream is https://opensource.apple.com/source/diskdev_cmds/
 
-# Download the source of the specified version of binutils
+# Download the source of the specified version of hfsplus
 wget -c -P $TMPDIR http://pkgs.fedoraproject.org/repo/pkgs/hfsplus-tools/${filename}/${md5sum}/${filename} || exit 1
 md5sum -c $TMPDIR/hfsplus.MD5 || exit 1
 mkdir hfsplus-source
diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index a07ed2942d14..e937d58292da 100644
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -113,7 +113,7 @@ linux64-cctools-port/opt:
             - 'taskcluster/taskgraph/transforms/job/toolchain.py'
 
 linux64-hfsplus/opt:
-    description: "hfplus toolchain build"
+    description: "hfsplus toolchain build"
     treeherder:
         kind: build
         platform: linux64/opt
@@ -122,6 +122,7 @@ linux64-hfsplus/opt:
     run:
         using: toolchain-script
         script: build-hfsplus-linux.sh
+        tooltool-downloads: public
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
diff --git a/taskcluster/scripts/misc/build-hfsplus-linux.sh b/taskcluster/scripts/misc/build-hfsplus-linux.sh
index 5d9f4f49fb35..9eb2d625e7b0 100755
--- a/taskcluster/scripts/misc/build-hfsplus-linux.sh
+++ b/taskcluster/scripts/misc/build-hfsplus-linux.sh
@@ -9,6 +9,11 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
+TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/clang.manifest
+. taskcluster/scripts/misc/tooltool-download.sh
+
+export PATH=$PATH:$HOME_DIR/src/clang/bin
+
 build/unix/build-hfsplus/build-hfsplus.sh $HOME_DIR
 
 # Put a tarball in the artifacts dir