diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 37876be9c..66420e9ac 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -73,4 +73,3 @@ The following areas really need contribution:
 - Extending the **continuous integration** toward more exotic compilers such as Android NDK, Intel's Compiler, or the bleeding-edge versions of GCC or Clang.
 - Improving the efficiency of the **JSON parser**. The current parser is implemented as a naive recursive descent parser with hand coded string handling. More sophisticated approaches like LALR parsers would be really appreciated. That said, parser generators like Bison or ANTLR do not play nice with single-header files -- I really would like to keep the parser inside the `json.hpp` header, and I am not aware of approaches similar to [`re2c`](http://re2c.org) for parsing.
 - Extending and updating existing **benchmarks** to include (the most recent version of) this library. Though efficiency is not everything, speed and memory consumption are very important characteristics for C++ developers, so having proper comparisons would be interesting.
-- Check the code with [**Coverity**](https://scan.coverity.com).
diff --git a/.travis.yml b/.travis.yml
index 49d9efd4b..249a87574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ matrix:
             description: "Build submitted via Travis CI"
           notification_email: niels.lohmann@gmail.com
           build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
-          build_command: "make coverity"
+          build_command: "make"
           branch_pattern: coverity_scan
       env: COMPILER=g++-5
 
diff --git a/Makefile b/Makefile
index 0a52b22da..6ea1d85d9 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,6 @@ doctest:
 	$(MAKE) check_output -C doc
 
 
-# copmpile example files and do not check output (for coverity-scan)
-coverity:
-	$(MAKE) compile_only -Cdoc CXXFLAGS="-std=c++11" CPPFLAGS="-I../src"
-
-
 ##########################################################################
 # fuzzing
 ##########################################################################
diff --git a/README.md b/README.md
index ba11b70e0..768943878 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/nlohmann/json.svg?branch=master)](https://travis-ci.org/nlohmann/json)
 [![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk?svg=true)](https://ci.appveyor.com/project/nlohmann/json)
 [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
 [![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/wuiuqYiYqRTdI3rG)
 [![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
diff --git a/doc/Makefile b/doc/Makefile
index a34a0798d..5e5459a00 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -37,9 +37,6 @@ create_output: $(EXAMPLES:.cpp=.output)
 
 create_links: $(EXAMPLES:.cpp=.link)
 
-# only compile files
-compile_only: $(EXAMPLES:.cpp=)
-
 # check output of all stand-alone example files
 check_output: $(EXAMPLES:.cpp=.test)