diff --git a/infra/base-images/Jenkinsfile b/infra/base-images/Jenkinsfile
index 1b43143cb..c8265e144 100644
--- a/infra/base-images/Jenkinsfile
+++ b/infra/base-images/Jenkinsfile
@@ -32,4 +32,7 @@ node {
 
   stage name: 'ossfuzz/libfuzzer-runner', concurrency: 1
   sh "docker build $dockerOptions -t ossfuzz/libfuzzer-runner infra/base-images/libfuzzer-runner"
+
+  stage name: 'ossfuzz/coverage', concurrency: 1
+  sh "docker build $dockerOptions -t ossfuzz/coverage infra/base-images/coverage"
 }
diff --git a/infra/base-images/all.sh b/infra/base-images/all.sh
index 2dbeb83ac..45b142261 100755
--- a/infra/base-images/all.sh
+++ b/infra/base-images/all.sh
@@ -19,4 +19,4 @@ docker build --pull -t ossfuzz/base $@ infra/base-images/base
 docker build -t ossfuzz/base-clang $@ infra/base-images/base-clang
 docker build -t ossfuzz/base-libfuzzer $@ infra/base-images/base-libfuzzer
 docker build -t ossfuzz/libfuzzer-runner $@ infra/base-images/libfuzzer-runner
-
+docker build -t ossfuzz/coverage $@ infra/base-images/coverage
diff --git a/infra/base-images/coverage/Dockerfile b/infra/base-images/coverage/Dockerfile
new file mode 100644
index 000000000..a9c13e2b6
--- /dev/null
+++ b/infra/base-images/coverage/Dockerfile
@@ -0,0 +1,23 @@
+# Copyright 2016 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.
+#
+################################################################################
+
+FROM ossfuzz/base-clang
+MAINTAINER vitalybuka@gmail.com
+RUN apt-get install -y python3 curl
+
+RUN mkdir -p /src/coverage/
+RUN cd /src/coverage/ && curl -O http://llvm.org/svn/llvm-project/llvm/trunk/tools/sancov/coverage-report-server.py && chmod +x coverage-report-server.py
+COPY coverage /src/coverage/
diff --git a/infra/base-images/coverage/coverage b/infra/base-images/coverage/coverage
new file mode 100755
index 000000000..ae413846e
--- /dev/null
+++ b/infra/base-images/coverage/coverage
@@ -0,0 +1,24 @@
+#!/bin/bash -eu
+# Copyright 2016 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.
+#
+################################################################################
+
+BINARY=$1
+
+sancov -symbolize *.sancov -strip_path_prefix=/ $BINARY >> cov.symcov
+
+(sleep 3; echo ; echo "Navigate to see coverage: http://127.0.0.1:8001/"; echo) &
+/src/coverage/coverage-report-server.py --host 0.0.0.0 --symcov cov.symcov --srcpath /
+