diff --git a/.travis.yml b/.travis.yml
index 8461c28e3..879dbb639 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,11 @@ matrix:
         - TRAVIS_ENGINE=afl
         - TRAVIS_SANITIZER=address
         - TRAVIS_ARCHITECTURE=x86_64
+    - name: "honggfuzz address x86_64"
+      env:
+        - TRAVIS_ENGINE=honggfuzz
+        - TRAVIS_SANITIZER=address
+        - TRAVIS_ARCHITECTURE=x86_64
     - name: "none address x86_64"
       env:
         - TRAVIS_ENGINE=none
diff --git a/infra/travis/travis_build.py b/infra/travis/travis_build.py
index 6a3cea42c..884c5d0af 100755
--- a/infra/travis/travis_build.py
+++ b/infra/travis/travis_build.py
@@ -25,7 +25,7 @@ import subprocess
 import yaml
 
 DEFAULT_ARCHITECTURES = ['x86_64']
-DEFAULT_ENGINES = ['afl', 'libfuzzer']
+DEFAULT_ENGINES = ['afl', 'honggfuzz', 'libfuzzer']
 DEFAULT_SANITIZERS = ['address', 'undefined']
 
 
@@ -125,7 +125,10 @@ def build_project(project):
 
   print('Building project', project)
   build_fuzzers(project, engine, sanitizer, architecture)
-  if engine != 'none':
+
+  # TODO(https://github.com/google/oss-fuzz/issues/3592): Re-enable after
+  # Honggfuzz is supported in check_build.
+  if engine not in ['none', 'honggfuzz']:
     check_build(project, engine, sanitizer, architecture)
 
 
diff --git a/projects/zlib/build.sh b/projects/zlib/build.sh
index dbffa1a04..197bf12a8 100755
--- a/projects/zlib/build.sh
+++ b/projects/zlib/build.sh
@@ -1,4 +1,19 @@
 #!/bin/bash -eu
+# Copyright 2020 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
 
 ./configure
 make -j$(nproc) clean
diff --git a/projects/zlib/project.yaml b/projects/zlib/project.yaml
index 25a23b91d..c4ed2628e 100644
--- a/projects/zlib/project.yaml
+++ b/projects/zlib/project.yaml
@@ -7,6 +7,7 @@ auto_ccs:
 fuzzing_engines:
   - libfuzzer
   - afl
+  - honggfuzz
   - dataflow
 sanitizers:
   - address