diff --git a/docs/faq.md b/docs/faq.md
index ca02b9ba8..eab450533 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -54,7 +54,6 @@ your own environment and run continuously at scale.
 OSS-Fuzz is a production instance of ClusterFuzz, plus the code living in
 [OSS-Fuzz repository]: build scripts, `project.yaml` files with contacts, etc.
 
-[ClusterFuzz]: https://github.com/google/clusterfuzz
 [OSS-Fuzz repository]: https://github.com/google/oss-fuzz
 
 ## Why do you use a [different issue tracker](https://bugs.chromium.org/p/oss-fuzz/issues/list) for reporting bugs in OSS projects?
@@ -163,23 +162,25 @@ target (instructions to download
 restore it to the new GCS location later (instruction to find the
 new location [here]({{ site.baseurl }}/advanced-topics/corpora/#viewing-the-corpus-for-a-fuzz-target)).
 
-## Does OSS-Fuzz support AFL?
-OSS-Fuzz *uses* [AFL](http://lcamtuf.coredump.cx/afl/) as one of its
-[fuzzing engines]({{ site.baseurl }}/reference/glossary/#fuzzing-engine) but this is an implementation
-detail. Just follow the
+## Does OSS-Fuzz support AFL or honggfuzz?
+OSS-Fuzz *uses* both [AFL](http://lcamtuf.coredump.cx/afl/) and
+[honggfuzz](https://github.com/google/honggfuzz)
+[fuzzing engines]({{ site.baseurl }}/reference/glossary/#fuzzing-engine).
+Follow the
 [ideal integration guide]({{ site.baseurl }}/advanced-topics/ideal-integration/)
 and OSS-Fuzz will use all its fuzzing engines on your code.
 
-## Does OSS-Fuzz support Honggfuzz?
-OSS-Fuzz (the service) does not use honggfuzz to find bugs.
-That is because [ClusterFuzz](https://github.com/google/clusterfuzz)
-(the infrastructure OSS-Fuzz runs on) does not support honggfuzz. 
-However, OSS-Fuzz supports **building** fuzz targets for use with honggfuzz,
-similar to the way it supports [AFL](#does-oss-fuzz-support-afl). 
-Currently OSS-Fuzz builders do builds for libFuzzer, AFL, and honggfuzz.
-
 ## What are the specs on your machines?
 OSS-Fuzz builders have 32CPU/28.8GB RAM.
 
 Fuzzing machines only have a single core and fuzz targets should not use more
 than 2.5GB of RAM.
+
+## Are there any restrictions on using test cases / corpora generated by OSS-Fuzz?
+
+No, you can freely use (i.e. share, add to your repo, etc.) the test cases and
+corpora generated by OSS-Fuzz. OSS-Fuzz infrastructure is fully open source
+(including [ClusterFuzz], various fuzzing engines, and other dependencies). We
+have no intent to restrict the use of the artifacts produced by OSS-Fuzz.
+
+[ClusterFuzz]: https://github.com/google/clusterfuzz