diff --git a/README.md b/README.md
index d548b0f4fb2..e4a12a053d2 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![CircleCI](https://img.shields.io/circleci/project/JabRef/jabref.svg)](https://circleci.com/gh/JabRef/jabref)
 [![Dependency Status](https://www.versioneye.com/user/projects/557f2723386664002000009c/badge.svg?style=flat)](https://www.versioneye.com/user/projects/557f2723386664002000009c)
 [![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
+[![Coverity Status](https://badges.ondemand.coverity.com/streams/unhetcisrp7nna3b5cilqev4bk)](https://ondemand.coverity.com/streams/unhetcisrp7nna3b5cilqev4bk)
 [![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt)
 [![Join the chat at https://gitter.im/JabRef/jabref](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JabRef/jabref?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Donation](https://img.shields.io/badge/donate-paypal-orange.svg)](https://www.paypal.com/cgi-bin/webscr?item_name=JabRef+Bibliography+Manager&cmd=_donations&lc=US&currency_code=EUR&business=jabrefmail%40gmail.com)
diff --git a/build.gradle b/build.gradle
index 228e00fce8b..38f79d14d57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@ import org.gradle.internal.os.OperatingSystem
 plugins {
     id 'com.github.johnrengelman.shadow' version '1.2.2'
     id "edu.sc.seis.launch4j" version "1.1.4"
-    id "com.github.kt3k.coveralls" version "2.4.0"
+    id "com.github.kt3k.coveralls" version "2.4.0x"
     id "edu.sc.seis.macAppBundle" version "2.1.1"
     id "com.github.youribonnaffe.gradle.format" version "1.2"
+    id "com.coverity.ondemand" version "1.3.708"
 }
 
 apply plugin: "java"
@@ -15,6 +16,17 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 apply from: 'eclipse.gradle'
 
+// HACK to disable coverityCheck task when not on CI server
+// necessary as coverity automatically adds check.dependsOn coverityCheck
+gradle.taskGraph.whenReady { taskGraph ->
+    def tasks = taskGraph.getAllTasks()
+    if (System.env.CI == null) {
+        tasks.findAll {it.name.startsWith('coverityCheck')}.each { task ->
+                task.enabled = false
+        }
+    }
+}
+
 group = "net.sf.jabref"
 version = "2.80dev"
 project.ext.threeDotVersion = "2.80.0.0"
@@ -27,6 +39,7 @@ task wrapper(type: Wrapper) {
     gradleVersion = '2.8'
 }
 
+
 repositories {
     jcenter()
 }
diff --git a/circle.yml b/circle.yml
index 89d989550c2..3cc5757132a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,6 +18,7 @@ test:
   override:
     - TERM=dumb ./gradlew test
   post:
+    - TERM=dumb ./gradlew coverityCheck
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
     - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
     - TERM=dumb ./gradlew jacocoTestReport coveralls