diff --git a/infra/base-images/base-builder/compile_honggfuzz b/infra/base-images/base-builder/compile_honggfuzz
index 1e86910b8..a2d5443de 100755
--- a/infra/base-images/base-builder/compile_honggfuzz
+++ b/infra/base-images/base-builder/compile_honggfuzz
@@ -20,12 +20,15 @@ echo -n "Compiling honggfuzz to $LIB_FUZZING_ENGINE ..."
 pushd $SRC/honggfuzz > /dev/null
 make clean
 CC=clang CFLAGS= make
-# libhfuzz.a willl be added by CC/CXX linker directly during linking,
-# but its defined here to satisfy the build infrastructure
+# libhfuzz.a will be added by CC/CXX linker directly during linking,
+# but it's defined here to satisfy the build infrastructure
 cp libhfuzz/libhfuzz.a $LIB_FUZZING_ENGINE
 cp honggfuzz $OUT/
 popd > /dev/null
 
+# Tell hfuzz-clang which exactly clang binary to use (otherwise hfuzz-clang
+# would try various ones (clang-5.0, clang-4.0, clang-devel, etc.)
+export HFUZZ_CC_PATH="$CC"
 # Relevant coverage flags are added by the compiler/linker
 export COVERAGE_FLAGS=
 export CC=$SRC/honggfuzz/hfuzz_cc/hfuzz-clang
diff --git a/infra/base-images/base-runner/run_fuzzer b/infra/base-images/base-runner/run_fuzzer
index ea80d2cc4..f1237dd20 100755
--- a/infra/base-images/base-runner/run_fuzzer
+++ b/infra/base-images/base-runner/run_fuzzer
@@ -54,7 +54,7 @@ elif [[ "$FUZZING_ENGINE" = honggfuzz ]]; then
   rm -rf /tmp/honggfuzz_workdir && mkdir /tmp/honggfuzz_workdir
   # --exit_upon_crash: exit whith a first crash seen
   # -R (report): save report file to this location
-  # -W (working dir): where the crashes and the report file go
+  # -W (working dir): where the crashes go
   # -v (verbose): don't use VTE UI, just stderr
   # -z: use software-instrumentation of clang (trace-pc-guard....)
   # -P: use persistent mode of fuzzing (i.e. LLVMFuzzerTestOneInput)